summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2011-04-13 13:17:51 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-17 13:52:45 +0200
commit042c3732d80b8061c2728caa6057207ec8fa1683 (patch)
tree2851b24ffe3cc2e50cfbfe40c9e07fc12e89c530
parentecca617a15ef8ca7dda99ab6057aa3189072f215 (diff)
ooo340fixes: fix some gnumake migration leftovers [hg:4624ad74b5c1]
-rw-r--r--vcl/Library_desktop_detector.mk4
-rwxr-xr-xvcl/Library_vcl.mk2
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
index 49151cb19ff5..f72a9ff737bf 100644
--- a/vcl/Library_desktop_detector.mk
+++ b/vcl/Library_desktop_detector.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Library_set_include,desktop_detector,\
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Library_set_defs,vclplug_kde,\
+$(eval $(call gb_Library_set_defs,desktop_detector,\
$$(DEFS) \
-DDESKTOP_DETECTOR_IMPLEMENTATION \
))
@@ -71,7 +71,7 @@ $(eval $(call gb_Library_add_linked_libs,desktop_detector,\
ICE \
))
-$(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
+$(eval $(call gb_Library_add_exception_objects,desktop_detector,\
vcl/unx/generic/desktopdetect/desktopdetector \
))
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index ae7e52e79abb..2b50b1ef44b5 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -93,7 +93,7 @@ $(eval $(call gb_Library_set_cxxflags,vcl,\
$$(OBJCXXFLAGS) \
))
ifeq ($(ENABLE_CAIRO),TRUE)
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
+$(eval $(call gb_Library_set_defs,vcl,\
$$(DEFS) \
-DCAIRO \
))