openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ar...@apache.org
Subject svn commit: r1409400 [4/4] - in /incubator/ooo/branches/gbuild/main: ./ UnoControls/prj/ accessibility/prj/ animations/prj/ basctl/source/dlged/ basegfx/prj/ basic/prj/ binaryurp/prj/ binfilter/bf_svx/source/items/ binfilter/bf_svx/source/unodraw/ binf...
Date Wed, 14 Nov 2012 21:10:21 GMT
Modified: incubator/ooo/branches/gbuild/main/vcl/StaticLibrary_vclmain.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/vcl/StaticLibrary_vclmain.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/vcl/StaticLibrary_vclmain.mk (original)
+++ incubator/ooo/branches/gbuild/main/vcl/StaticLibrary_vclmain.mk Wed Nov 14 21:10:00 2012
@@ -23,12 +23,16 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,vclmain))
 
+$(eval $(call gb_StaticLibrary_add_api,vclmain,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_StaticLibrary_set_include,vclmain,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/vcl/inc \
 	-I$(SRCDIR)/vcl/inc/pch \
 	-I$(SRCDIR)/solenv/inc \
-	-I$(OUTDIR)/inc/offuh \
 	-I$(OUTDIR)/inc/stl \
 	-I$(OUTDIR)/inc \
 ))
@@ -42,7 +46,7 @@ $(eval $(call gb_StaticLibrary_add_excep
 # Instead of this evil linking of an object from $(OUTDIR)
 define StaticLibrary_salmain_hack
 $(call gb_StaticLibrary_get_target,vclmain) : $(OUTDIR)/lib/$(1)
-$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,vcl/source/salmain/salmain)))
+$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,vcl/source/salmain/salmain),$(1)))
 
 $(OUTDIR)/lib/$(1) : $(call gb_CxxObject_get_target,vcl/source/salmain/salmain)
 	$$(call gb_Deliver_deliver,$$<,$$@)

Modified: incubator/ooo/branches/gbuild/main/vcl/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/vcl/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/vcl/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/vcl/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -1,4 +1,4 @@
-vc	vcl	:	L10N:l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite
i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools
l10ntools icc SO:print_header cpputools shell svl LIBXSLT:libxslt NULL
+vc	vcl	:	L10N:l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite
i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offapi basegfx basebmp tools
l10ntools icc SO:print_header cpputools shell svl LIBXSLT:libxslt NULL
 vc	vcl										usr1	-	all	vc_mkout NULL
 vc	vcl\prj									nmake	-	all	vc_prj NULL
 

Modified: incubator/ooo/branches/gbuild/main/xmloff/Library_xo.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmloff/Library_xo.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmloff/Library_xo.mk (original)
+++ incubator/ooo/branches/gbuild/main/xmloff/Library_xo.mk Wed Nov 14 21:10:00 2012
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,xo,
 	-I$(SRCDIR)/xmloff/inc \
 	-I$(SRCDIR)/xmloff/source/inc \
 	-I$(SRCDIR)/xmloff/inc/pch \
-	-I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,xo,\
@@ -43,6 +42,11 @@ $(eval $(call gb_Library_set_defs,xo,\
 	-DXMLOFF_DLLIMPLEMENTATION \
 ))
 
+$(eval $(call gb_Library_add_api,xo,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,xo,\
 	basegfx \
 	comphelper \

Modified: incubator/ooo/branches/gbuild/main/xmloff/Library_xof.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmloff/Library_xof.mk?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmloff/Library_xof.mk (original)
+++ incubator/ooo/branches/gbuild/main/xmloff/Library_xof.mk Wed Nov 14 21:10:00 2012
@@ -30,7 +30,11 @@ $(eval $(call gb_Library_set_include,xof
 	-I$(SRCDIR)/xmloff/inc \
 	-I$(SRCDIR)/xmloff/source/inc \
 	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,xof,\
+	udkapi \
+	offapi \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,xof,\

Modified: incubator/ooo/branches/gbuild/main/xmlreader/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/xmlreader/prj/build.lst?rev=1409400&r1=1409399&r2=1409400&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/xmlreader/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/xmlreader/prj/build.lst Wed Nov 14 21:10:00 2012
@@ -1,3 +1,3 @@
-xr xmlreader : BOOST:boost cppu offuh sal stlport NULL
+xr xmlreader : BOOST:boost cppu offapi sal stlport NULL
 xr xmlreader\inc nmake - all xr_inc NULL
 xr xmlreader\source nmake - all xr_source xr_inc NULL



Mime
View raw message