[Libreoffice-commits] .: 3 commits - desktop/Executable_quickstart.mk desktop/Executable_sbase.mk desktop/Executable_scalc.mk desktop/Executable_sdraw.mk desktop/Executable_simpress.mk desktop/Executable_smath.mk desktop/Executable_soffice.mk desktop/Executable_sweb.mk desktop/Executable_swriter.mk solenv/gbuild vcl/Library_vcl.mk
David Tardon
dtardon at kemper.freedesktop.org
Tue Sep 27 11:02:26 PDT 2011
desktop/Executable_quickstart.mk | 2 +-
desktop/Executable_sbase.mk | 2 +-
desktop/Executable_scalc.mk | 2 +-
desktop/Executable_sdraw.mk | 2 +-
desktop/Executable_simpress.mk | 2 +-
desktop/Executable_smath.mk | 2 +-
desktop/Executable_soffice.mk | 2 +-
desktop/Executable_sweb.mk | 2 +-
desktop/Executable_swriter.mk | 2 +-
solenv/gbuild/Library.mk | 1 -
solenv/gbuild/platform/windows.mk | 14 ++++++++------
solenv/gbuild/platform/winmingw.mk | 14 ++++++++------
vcl/Library_vcl.mk | 2 +-
13 files changed, 26 insertions(+), 23 deletions(-)
New commits:
commit b6d8251eee90b7e24ebb3f8452eff36a507e6d91
Author: David Tardon <dtardon at redhat.com>
Date: Tue Sep 27 20:00:22 2011 +0200
move windows-only call into platform/win*
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index baa8d9e..10bee87 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -60,7 +60,6 @@ $$(eval $$(call gb_Output_error,Library $(1) must be registered in Repository.mk
endif
$(call gb_Library_get_target,$(1)) : AUXTARGETS :=
$(call gb_Library__Library_impl,$(1),$(call gb_Library_get_linktargetname,$(1)))
-$(call gb_Library_add_default_nativeres,$(1),$(1)/default)
endef
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index e2ba1a4..901b57a 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -508,6 +508,8 @@ $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS += \
$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))) \
$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))) \
+$(call gb_Library_add_default_nativeres,$(1),$(1)/default)
+
endif
$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 50a5a7e..d4f475c 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -516,6 +516,8 @@ $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir
$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))
+$(call gb_Library_add_default_nativeres,$(1),$(1)/default)
+
endef
define gb_Library_add_default_nativeres
commit 2e2dcefb5fde4672f1fef96a3be6a046c3bad3bb
Author: David Tardon <dtardon at redhat.com>
Date: Tue Sep 27 19:54:42 2011 +0200
make WinResTarget's name independent of LinkTarget
diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk
index 593ef1f..3259cc1 100644
--- a/desktop/Executable_quickstart.mk
+++ b/desktop/Executable_quickstart.mk
@@ -60,6 +60,6 @@ $(eval $(call gb_Executable_add_exception_objects,quickstart,\
desktop/win32/source/QuickStart/QuickStart \
))
-$(eval $(call gb_Executable_add_nativeres,quickstart,src))
+$(eval $(call gb_Executable_add_nativeres,quickstart,quickstart/src))
# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk
index d5e0991..14e6487 100644
--- a/desktop/Executable_sbase.mk
+++ b/desktop/Executable_sbase.mk
@@ -43,6 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,sbase,\
desktop/win32/source/applauncher/sbase \
))
-$(eval $(call gb_Executable_add_nativeres,sbase,src))
+$(eval $(call gb_Executable_add_nativeres,sbase,sbase/src))
# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk
index 550add6..401e557 100644
--- a/desktop/Executable_scalc.mk
+++ b/desktop/Executable_scalc.mk
@@ -43,6 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,scalc,\
desktop/win32/source/applauncher/scalc \
))
-$(eval $(call gb_Executable_add_nativeres,scalc,src))
+$(eval $(call gb_Executable_add_nativeres,scalc,scalc/src))
# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk
index 29fb387..e8296e7 100644
--- a/desktop/Executable_sdraw.mk
+++ b/desktop/Executable_sdraw.mk
@@ -43,6 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,sdraw,\
desktop/win32/source/applauncher/sdraw \
))
-$(eval $(call gb_Executable_add_nativeres,sdraw,src))
+$(eval $(call gb_Executable_add_nativeres,sdraw,sdraw/src))
# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk
index 281718c..1b649d8 100644
--- a/desktop/Executable_simpress.mk
+++ b/desktop/Executable_simpress.mk
@@ -43,6 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,simpress,\
desktop/win32/source/applauncher/simpress \
))
-$(eval $(call gb_Executable_add_nativeres,simpress,src))
+$(eval $(call gb_Executable_add_nativeres,simpress,simpress/src))
# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk
index e8de100..365c435 100644
--- a/desktop/Executable_smath.mk
+++ b/desktop/Executable_smath.mk
@@ -43,6 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,smath,\
desktop/win32/source/applauncher/smath \
))
-$(eval $(call gb_Executable_add_nativeres,smath,src))
+$(eval $(call gb_Executable_add_nativeres,smath,smath/src))
# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index cf142d6..aebdc12 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -50,6 +50,6 @@ $(eval $(call gb_Executable_add_noexception_objects,soffice,\
desktop/win32/source/officeloader/officeloader \
))
-$(eval $(call gb_Executable_add_nativeres,soffice,src))
+$(eval $(call gb_Executable_add_nativeres,soffice,soffice/src))
# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk
index 67daa62..cd88fb9 100644
--- a/desktop/Executable_sweb.mk
+++ b/desktop/Executable_sweb.mk
@@ -43,6 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,sweb,\
desktop/win32/source/applauncher/sweb \
))
-$(eval $(call gb_Executable_add_nativeres,sweb,src))
+$(eval $(call gb_Executable_add_nativeres,sweb,sweb/src))
# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk
index d38ea6e..2c18e26 100644
--- a/desktop/Executable_swriter.mk
+++ b/desktop/Executable_swriter.mk
@@ -43,6 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,swriter,\
desktop/win32/source/applauncher/swriter \
))
-$(eval $(call gb_Executable_add_nativeres,swriter,src))
+$(eval $(call gb_Executable_add_nativeres,swriter,swriter/src))
# vim: set ts=4 sw=4 et:
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index a3bcc8d..baa8d9e 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -60,7 +60,7 @@ $$(eval $$(call gb_Output_error,Library $(1) must be registered in Repository.mk
endif
$(call gb_Library_get_target,$(1)) : AUXTARGETS :=
$(call gb_Library__Library_impl,$(1),$(call gb_Library_get_linktargetname,$(1)))
-$(call gb_Library_add_default_nativeres,$(1),default)
+$(call gb_Library_add_default_nativeres,$(1),$(1)/default)
endef
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index e91d5b0..e2ba1a4 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -518,22 +518,22 @@ $(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_g
endef
define gb_Library_add_default_nativeres
-$(call gb_WinResTarget_WinResTarget_init,$(1)/$(2))
-$(call gb_WinResTarget_add_file,$(1)/$(2),solenv/inc/shlinfo)
-$(call gb_WinResTarget_set_defs,$(1)/$(2),\
+$(call gb_WinResTarget_WinResTarget_init,$(2))
+$(call gb_WinResTarget_add_file,$(2),solenv/inc/shlinfo)
+$(call gb_WinResTarget_set_defs,$(2),\
$$(DEFS) \
-DADDITIONAL_VERINFO1 \
-DADDITIONAL_VERINFO2 \
-DADDITIONAL_VERINFO3 \
)
$(call gb_Library_add_nativeres,$(1),$(2))
-$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(1)/$(2))
+$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(2))
endef
define gb_LinkTarget_add_nativeres
-$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(1)/$(2))
-$(call gb_LinkTarget_get_target,$(1)) : NATIVERES += $(call gb_WinResTarget_get_target,$(1)/$(2))
+$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(2))
+$(call gb_LinkTarget_get_target,$(1)) : NATIVERES += $(call gb_WinResTarget_get_target,$(2))
endef
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index ceb91d2..50a5a7e 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -519,22 +519,22 @@ $(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))
endef
define gb_Library_add_default_nativeres
-$(call gb_WinResTarget_WinResTarget_init,$(1)/$(2))
-$(call gb_WinResTarget_add_file,$(1)/$(2),solenv/inc/shlinfo)
-$(call gb_WinResTarget_set_defs,$(1)/$(2),\
+$(call gb_WinResTarget_WinResTarget_init,$(2))
+$(call gb_WinResTarget_add_file,$(2),solenv/inc/shlinfo)
+$(call gb_WinResTarget_set_defs,$(2),\
$$(DEFS) \
-DADDITIONAL_VERINFO1 \
-DADDITIONAL_VERINFO2 \
-DADDITIONAL_VERINFO3 \
)
$(call gb_Library_add_nativeres,$(1),$(2))
-$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(1)/$(2))
+$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(2))
endef
define gb_LinkTarget_add_nativeres
-$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(1)/$(2))
-$(call gb_LinkTarget_get_target,$(1)) : NATIVERES += $(call gb_WinResTarget_get_target,$(1)/$(2))
+$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(2))
+$(call gb_LinkTarget_get_target,$(1)) : NATIVERES += $(call gb_WinResTarget_get_target,$(2))
endef
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index f97b256..07da2dd 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -500,7 +500,7 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
version \
))
-$(eval $(call gb_Library_add_nativeres,vcl,src))
+$(eval $(call gb_Library_add_nativeres,vcl,vcl/src))
ifeq ($(COM),MSC)
$(eval $(call gb_Library_add_ldflags,vcl,\
/ENTRY:LibMain at 12 \
commit edb760e625b899ac374b7f85ebe725389a02ef8a
Author: David Tardon <dtardon at redhat.com>
Date: Tue Sep 27 19:41:53 2011 +0200
correct link target name should be propagated from gb_Library_add_nativeres
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 2187a85..ceb91d2 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -533,8 +533,8 @@ $(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_targ
endef
define gb_LinkTarget_add_nativeres
-$(call gb_LinkTarget_get_target,$(call gb_Library__get_linktargetname,$(1))) : $(call gb_WinResTarget_get_target,$(1)/$(2))
-$(call gb_LinkTarget_get_target,$(call gb_Library__get_linktargetname,$(1))) : NATIVERES += $(call gb_WinResTarget_get_target,$(1)/$(2))
+$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(1)/$(2))
+$(call gb_LinkTarget_get_target,$(1)) : NATIVERES += $(call gb_WinResTarget_get_target,$(1)/$(2))
endef
More information about the Libreoffice-commits
mailing list