diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-21 12:54:01 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-21 12:54:01 +0200 |
commit | 100fd14a70892a7c183574c3fc58672a04689211 (patch) | |
tree | db452f9dbdd5535214fb1cec78080951e5e25456 | |
parent | Merge branch 'master' into feature/gnumake4 (diff) | |
download | core-100fd14a70892a7c183574c3fc58672a04689211.tar.gz core-100fd14a70892a7c183574c3fc58672a04689211.zip |
gnumake4: postmerge fixes in sc
-rw-r--r-- | chart2/JunitTest_chart2_unoapi.mk | 2 | ||||
-rw-r--r-- | chart2/Library_charttools.mk | 3 | ||||
-rw-r--r-- | chart2/Library_chartview.mk | 3 | ||||
-rw-r--r-- | sc/Library_sc.mk | 3 | ||||
-rw-r--r-- | sc/Library_scd.mk | 4 | ||||
-rw-r--r-- | sc/Library_scfilt.mk | 4 | ||||
-rw-r--r-- | sc/Library_scui.mk | 4 | ||||
-rw-r--r-- | sc/Library_sd.mk | 0 | ||||
-rw-r--r-- | sc/Library_vbaobj.mk | 10 |
9 files changed, 5 insertions, 28 deletions
diff --git a/chart2/JunitTest_chart2_unoapi.mk b/chart2/JunitTest_chart2_unoapi.mk index 1571f3dde8cb..da35eea53a44 100644 --- a/chart2/JunitTest_chart2_unoapi.mk +++ b/chart2/JunitTest_chart2_unoapi.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_JunitTest_JunitTest,chart2_unoapi)) +$(eval $(call gb_JunitTest_JunitTest,chart2_unoapi,SRCDIR)) $(eval $(call gb_JunitTest_set_defs,chart2_unoapi,\ $$(DEFS) \ diff --git a/chart2/Library_charttools.mk b/chart2/Library_charttools.mk index 2bf40ca05750..6f4660be7747 100644 --- a/chart2/Library_charttools.mk +++ b/chart2/Library_charttools.mk @@ -37,8 +37,7 @@ $(eval $(call gb_Library_set_include,charttools,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,charttools,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,charttools,\ -DOOO_DLLIMPLEMENTATION_CHARTTOOLS \ )) diff --git a/chart2/Library_chartview.mk b/chart2/Library_chartview.mk index 802a13d40728..82f29ac189d6 100644 --- a/chart2/Library_chartview.mk +++ b/chart2/Library_chartview.mk @@ -38,8 +38,7 @@ $(eval $(call gb_Library_set_include,chartview,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,chartview,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,chartview,\ -DOOO_DLLIMPLEMENTATION_CHARTVIEW \ )) diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 5e9375398d9e..7f1f36a0263b 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -39,8 +39,7 @@ $(eval $(call gb_Library_set_include,sc,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,sc,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,sc,\ -DSC_DLLIMPLEMENTATION \ -DSC_INFO_OSVERSION=\"$(OS)\" \ )) diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk index 0331df2f9733..628684545ef9 100644 --- a/sc/Library_scd.mk +++ b/sc/Library_scd.mk @@ -33,10 +33,6 @@ $(eval $(call gb_Library_set_include,scd,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,scd,\ - $$(DEFS) \ -)) - $(eval $(call gb_Library_add_linked_libs,scd,\ cppu \ cppuhelper \ diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index edcfd7ce11ad..5c74d094e9ff 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -37,10 +37,6 @@ $(eval $(call gb_Library_set_include,scfilt,\ -I$(OUTDIR)/inc \ )) -$(eval $(call gb_Library_set_defs,scfilt,\ - $$(DEFS) \ -)) - $(eval $(call gb_Library_add_linked_libs,scfilt,\ basegfx \ comphelper \ diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk index c85de9f15584..3473fa74b09a 100644 --- a/sc/Library_scui.mk +++ b/sc/Library_scui.mk @@ -33,10 +33,6 @@ $(eval $(call gb_Library_set_include,scui,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,scui,\ - $$(DEFS) \ -)) - $(eval $(call gb_Library_add_linked_libs,scui,\ comphelper \ cppu \ diff --git a/sc/Library_sd.mk b/sc/Library_sd.mk new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/sc/Library_sd.mk diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index 6ef54b386626..437607ddc949 100644 --- a/sc/Library_vbaobj.mk +++ b/sc/Library_vbaobj.mk @@ -35,8 +35,7 @@ $(eval $(call gb_Library_set_include,vbaobj,\ $(eval $(call gb_Library_set_componentfile,vbaobj,sc/util/vbaobj)) -$(eval $(call gb_Library_set_defs,vbaobj,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vbaobj,\ -DVBA_OOBUILD_HACK \ )) @@ -133,13 +132,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ sc/source/ui/vba/vbawsfunction \ )) -ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) -$(eval $(call gb_Library_set_ldflags,vbaobj,\ - $$(LDFLAGS) \ - -Wl$(COMMA)-z$(COMMA)noexecstack \ -)) -endif - ifeq ($(OS),WNT) $(eval $(call gb_Library_add_linked_libs,vbaobj,\ advapi32 \ |