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 /chart2 | |
| parent | ea1f63a45c3b1ab79c6428ec239a8a269de3c430 (diff) | |
gnumake4: postmerge fixes in sc
Diffstat (limited to 'chart2')
| -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 |
3 files changed, 3 insertions, 5 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 \ )) |