external/CustomTarget_jawt.mk | 11 ++++++-----
external/CustomTarget_mingw_dlls.mk | 9 +--------
external/CustomTarget_wine.mk | 3 +--
m4/mingw.m4 | 3 +--
4 files changed, 9 insertions(+), 17 deletions(-)
New commits:
commit 9eb90b97e80979d384640763507004b2df102379
Author: David Tardon <dtar...@redhat.com>
Date: Mon Dec 31 10:52:35 2012 +0100
the wine .def files are in $SRCDIR
Change-Id: I18469885d2d66b72aa89ef7a0faa449563e49ebc
diff --git a/external/CustomTarget_wine.mk b/external/CustomTarget_wine.mk
index bd30381..ce79cf6 100644
--- a/external/CustomTarget_wine.mk
+++ b/external/CustomTarget_wine.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_CustomTarget_register_targets,external/wine,\
liburlmod.dll.a \
))
-$(call gb_CustomTarget_get_target,external/wine)/lib%.dll.a: $(call
gb_CustomTarget_get_workdir,external/wine)/%.def
+$(call gb_CustomTarget_get_target,external/wine)/lib%.dll.a :
$(SRCDIR)/external/wine/lib/%.def
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DLT,1)
$(DLLTOOL) --kill-at --input-def=$< --output-lib=$@ --dllname=$*.dll
commit fe367205f592a8672427a8ab17009a8fc2695ca5
Author: David Tardon <dtar...@redhat.com>
Date: Mon Dec 31 10:50:27 2012 +0100
configure only looks in $MINGW_SYSROOT
Change-Id: I8882525ae6ae24957d9e34fc1ab8d5525251889c
diff --git a/external/CustomTarget_mingw_dlls.mk
b/external/CustomTarget_mingw_dlls.mk
index c1d240c..6bac40b 100644
--- a/external/CustomTarget_mingw_dlls.mk
+++ b/external/CustomTarget_mingw_dlls.mk
@@ -65,18 +65,11 @@ MINGW_DLLS := \
$(if $(filter YES,$(MINGW_SHARED_GCCLIB)),$(MINGW_GCCDLL)) \
$(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_GXXDLL))
-POTENTIAL_MINGW_RUNTIME_BINDIRS := \
- $(COMPATH)/$(HOST_PLATFORM)/sys-root/mingw/bin \
- /usr/$(HOST_PLATFORM)/sys-root/mingw/bin
-
$(eval $(call gb_CustomTarget_register_targets,external/wine,\
$(MINGW_DLLS) \
))
-$(call gb_CustomTarget_get_workdir,external/mingw-dlls)/%.dll: $(firstword
$(wildcard $(foreach dir,$(POTENTIAL_MINGW_RUNTIME_BINDIRS), $(dir)/%)))
- if ! test -f $<; then \
- echo Could not find $*.dll in any of
$(POTENTIAL_MINGW_RUNTIME_BINDIRS); \
- fi
+$(call gb_CustomTarget_get_workdir,external/mingw-dlls)/%.dll :
$(MINGW_SYSROOT)/mingw/bin/%.dll
$(call gb_Output_announce,$*,$(true),CPY,1)
cp $< $*
diff --git a/m4/mingw.m4 b/m4/mingw.m4
index c7ab21d..eb2dadb 100644
--- a/m4/mingw.m4
+++ b/m4/mingw.m4
@@ -47,8 +47,7 @@ AC_DEFUN([libo_MINGW_CHECK_DLL],
[AC_ARG_VAR([MINGW_][$1][_DLL],[output variable containing the found dll
name])dnl
if test -n "$WITH_MINGW"; then
- dnl TODO move this to configure: there is no need to call $CC more than
once
- _libo_mingw_dlldir=`$CC -print-sysroot`/mingw/bin
+ _libo_mingw_dlldir="[$MINGW_SYSROOT]"/mingw/bin
_libo_mingw_dllname=
AC_MSG_CHECKING([for $2 dll])
commit 93d73b21a6e9fbc62bc5cf80cb360b74aef76fad
Author: David Tardon <dtar...@redhat.com>
Date: Mon Dec 31 10:39:27 2012 +0100
drop some unneeded explicit deps
Change-Id: If19289a78a8d6ac01ce2951fbef9e3ba575ed680
diff --git a/external/CustomTarget_jawt.mk b/external/CustomTarget_jawt.mk
index 72b9cc5..68663f7 100644
--- a/external/CustomTarget_jawt.mk
+++ b/external/CustomTarget_jawt.mk
@@ -9,16 +9,17 @@
$(eval $(call gb_CustomTarget_CustomTarget,external/jawt))
-$(eval $(call gb_CustomTarget_register_target,external/jawt,libjawt.dll.a))
+$(eval $(call gb_CustomTarget_register_targets,external/jawt,\
+ jawt.def \
+ libjawt.dll.a \
+))
-$(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def:| \
- $(call gb_CustomTarget_get_workdir,external/jawt)/.dir
+$(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def:
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
echo EXPORTS > $@
echo "JAWT_GetAWT@8" >> $@
-$(call gb_CustomTarget_get_target,external/jawt)/libjawt.dll.a: \
- $(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def
+$(call gb_CustomTarget_get_target,external/jawt)/libjawt.dll.a: $(call
gb_CustomTarget_get_workdir,external/jawt)/jawt.def
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DLT,1)
$(DLLTOOL) --input-def=$< --output-lib=$@ --dllname=jawt.dll
diff --git a/external/CustomTarget_wine.mk b/external/CustomTarget_wine.mk
index 7796e8c..bd30381 100644
--- a/external/CustomTarget_wine.mk
+++ b/external/CustomTarget_wine.mk
@@ -15,8 +15,7 @@ $(eval $(call gb_CustomTarget_register_targets,external/wine,\
liburlmod.dll.a \
))
-$(call gb_CustomTarget_get_target,external/wine)/lib%.dll.a: $(call
gb_CustomTarget_get_workdir,external/wine)/%.def | \
- $(call gb_CustomTarget_get_workdir,external/wine)/.dir
+$(call gb_CustomTarget_get_target,external/wine)/lib%.dll.a: $(call
gb_CustomTarget_get_workdir,external/wine)/%.def
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DLT,1)
$(DLLTOOL) --kill-at --input-def=$< --output-lib=$@ --dllname=$*.dll
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
