You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2011/09/18 00:33:19 UTC
svn commit: r1172086 - in /incubator/ooo/trunk/main/vcl:
Library_desktop_detector.mk Library_vcl.mk
Author: mst
Date: Sat Sep 17 22:33:19 2011
New Revision: 1172086
URL: http://svn.apache.org/viewvc?rev=1172086&view=rev
Log:
ooo340fixes: fix some gnumake migration leftovers
# HG changeset patch
# User Philipp Lohmann [pl] <Ph...@Oracle.COM>
# Date 1302693471 -7200
# Node ID 8c1c5118aa5674a33c32cada7ffc916fc90796ea
# Parent 56bc1b624a3a49dcbf38a6b83266e89817752230
Modified:
incubator/ooo/trunk/main/vcl/Library_desktop_detector.mk
incubator/ooo/trunk/main/vcl/Library_vcl.mk
Modified: incubator/ooo/trunk/main/vcl/Library_desktop_detector.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/Library_desktop_detector.mk?rev=1172086&r1=1172085&r2=1172086&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/Library_desktop_detector.mk (original)
+++ incubator/ooo/trunk/main/vcl/Library_desktop_detector.mk Sat Sep 17 22:33:19 2011
@@ -41,7 +41,7 @@ $(eval $(call gb_Library_set_include,des
-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
ICE \
))
-$(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
+$(eval $(call gb_Library_add_exception_objects,desktop_detector,\
vcl/unx/generic/desktopdetect/desktopdetector \
))
Modified: incubator/ooo/trunk/main/vcl/Library_vcl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/Library_vcl.mk?rev=1172086&r1=1172085&r2=1172086&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/Library_vcl.mk (original)
+++ incubator/ooo/trunk/main/vcl/Library_vcl.mk Sat Sep 17 22:33:19 2011
@@ -93,7 +93,7 @@ $(eval $(call gb_Library_set_cxxflags,vc
$$(OBJCXXFLAGS) \
))
ifeq ($(ENABLE_CAIRO),TRUE)
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
+$(eval $(call gb_Library_set_defs,vcl,\
$$(DEFS) \
-DCAIRO \
))