Modified: openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_svp.mk URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_svp.mk?rev=1731524&r1=1731523&r2=1731524&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_svp.mk (original) +++ openoffice/branches/gbuild-reintegration/main/vcl/Library_vclplug_svp.mk Sun Feb 21 11:57:04 2016 @@ -23,12 +23,16 @@ $(eval $(call gb_Library_Library,vclplug_svp)) +$(eval $(call gb_Library_add_api,vclplug_svp,\ + udkapi \ + offapi \ +)) + $(eval $(call gb_Library_set_include,vclplug_svp,\ $$(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 \ ))
Modified: openoffice/branches/gbuild-reintegration/main/vcl/StaticLibrary_vclmain.mk URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/vcl/StaticLibrary_vclmain.mk?rev=1731524&r1=1731523&r2=1731524&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/vcl/StaticLibrary_vclmain.mk (original) +++ openoffice/branches/gbuild-reintegration/main/vcl/StaticLibrary_vclmain.mk Sun Feb 21 11:57:04 2016 @@ -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: openoffice/branches/gbuild-reintegration/main/vcl/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/vcl/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/vcl/prj/build.lst (original) +++ openoffice/branches/gbuild-reintegration/main/vcl/prj/build.lst Sun Feb 21 11:57:04 2016 @@ -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: openoffice/branches/gbuild-reintegration/main/xmloff/Library_xo.mk URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmloff/Library_xo.mk?rev=1731524&r1=1731523&r2=1731524&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/xmloff/Library_xo.mk (original) +++ openoffice/branches/gbuild-reintegration/main/xmloff/Library_xo.mk Sun Feb 21 11:57:04 2016 @@ -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: openoffice/branches/gbuild-reintegration/main/xmloff/Library_xof.mk URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmloff/Library_xof.mk?rev=1731524&r1=1731523&r2=1731524&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/xmloff/Library_xof.mk (original) +++ openoffice/branches/gbuild-reintegration/main/xmloff/Library_xof.mk Sun Feb 21 11:57:04 2016 @@ -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: openoffice/branches/gbuild-reintegration/main/xmlreader/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmlreader/prj/build.lst?rev=1731524&r1=1731523&r2=1731524&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/xmlreader/prj/build.lst (original) +++ openoffice/branches/gbuild-reintegration/main/xmlreader/prj/build.lst Sun Feb 21 11:57:04 2016 @@ -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
