Sat Jun 18 02:35:17 PDT 2011

basegfx/prj/build.lst                  |    2 +-
 canvas/prj/build.lst                   |    2 +-
 comphelper/Library_comphelp.mk         |    6 +++++-
 comphelper/prj/build.lst               |    2 +-
 cppcanvas/prj/build.lst                |    2 +-
 dtrans/prj/build.lst                   |    2 +-
 i18nutil/prj/build.lst                 |    2 +-
 padmin/Executable_spadmin.bin.mk       |    6 +++++-
 padmin/Library_spa.mk                  |   10 +++++-----
 sot/Library_sot.mk                     |    6 +++++-
 svl/Library_fsstorage.mk               |    6 +++++-
 svl/Library_passwordcontainer.mk       |    6 +++++-
 svl/Library_svl.mk                     |    7 ++++++-
 svl/prj/build.lst                      |    2 +-
 svtools/Executable_bmp.mk              |    6 +++++-
 svtools/Executable_bmpsum.mk           |    6 +++++-
 svtools/Executable_g2g.mk              |    6 +++++-
 svtools/Library_hatchwindowfactory.mk  |    6 +++++-
 svtools/Library_productregistration.mk |    6 +++++-
 svtools/Library_svt.mk                 |    8 ++++++--
 svtools/prj/build.lst                  |    2 +-
 toolkit/Library_tk.mk                  |    6 +++++-
 tools/Library_tl.mk                    |    6 +++++-
 tools/StaticLibrary_ooopathutils.mk    |    2 +-
 tools/prj/build.lst                    |    2 +-
 ucbhelper/prj/build.lst                |    2 +-
 unotools/Library_utl.mk                |    6 +++++-
 unotools/prj/build.lst                 |    2 +-
 vcl/Library_desktop_detector.mk        |    6 +++++-
 vcl/Library_vcl.mk                     |    6 +++++-
 vcl/Library_vclplug_gen.mk             |    6 +++++-
 vcl/Library_vclplug_gtk.mk             |    6 +++++-
 vcl/Library_vclplug_kde.mk             |    6 +++++-
 vcl/Library_vclplug_kde4.mk            |    6 +++++-
 vcl/Library_vclplug_svp.mk             |    6 +++++-
 vcl/StaticLibrary_vclmain.mk           |    7 +++++--
 vcl/prj/build.lst                      |    2 +-
 37 files changed, 135 insertions(+), 43 deletions(-)

New commits:
commit 0e10554b4ebd4967db84293e8e012243903497d3
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 31 17:08:42 2011 +0200

    gb_Deliver_add_deliverable takes 3 params now

diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk
index 1b6496c..79b3ddd 100644
--- a/vcl/StaticLibrary_vclmain.mk
+++ b/vcl/StaticLibrary_vclmain.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,vclmain,\
 # 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),$(OUTDIR)/lib/$(1)))
 
 $(OUTDIR)/lib/$(1) : $(call gb_CxxObject_get_target,vcl/source/salmain/salmain)
 	$$(call gb_Deliver_deliver,$$<,$$@)
commit 3a2fe2277b599328ebebc5b45e83f5caf9b83cd5
Author: David Tardon <dtardon at redhat.com>
Date:   Mon May 30 18:47:58 2011 +0200

    remove all traces of offuh from makefiles

diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index 1a86c46..b77a8eb 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,utl,\
     $$(INCLUDE) \
     -I$(realpath $(SRCDIR)/unotools/inc/pch) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,utl,\
@@ -43,6 +42,11 @@ $(eval $(call gb_Library_set_defs,utl,\
     -DUNOTOOLS_DLLIMPLEMENTATION \
 ))
 
+$(eval $(call gb_Library_add_api,utl,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,utl,\
     comphelper \
     cppu \
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
index c7e1cd0..7a34ee7 100644
--- a/vcl/Library_desktop_detector.mk
+++ b/vcl/Library_desktop_detector.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,desktop_detector,\
     -I$(realpath $(SRCDIR)/vcl/inc) \
     -I$(realpath $(SRCDIR)/vcl/inc/pch) \
     -I$(SRCDIR)/solenv/inc \
-    -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
 ))
 
@@ -45,6 +44,11 @@ $(eval $(call gb_Library_set_defs,desktop_detector,\
     -DDESKTOP_DETECTOR_IMPLEMENTATION \
 ))
 
+$(eval $(call gb_Library_add_api,desktop_detector,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,desktop_detector,\
     vcl \
     tl \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index d663d46..c8292cf 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_Library_set_include,vcl,\
     -I$(realpath $(SRCDIR)/vcl/inc) \
     -I$(realpath $(SRCDIR)/vcl/inc/pch) \
     -I$(SRCDIR)/solenv/inc \
-    -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
     -I$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager \
 ))
@@ -61,6 +60,11 @@ $(eval $(call gb_Library_set_defs,vcl,\
     -DDLLPOSTFIX=$(subst $(or $(gb_Library_DLLEXT),$(gb_Library_PLAINEXT)),,$(gb_Library_OOOEXT)) \
 ))
 
+$(eval $(call gb_Library_add_api,vcl,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,vcl,\
     tl \
     utl \
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 494f36a..b5cca31 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -32,10 +32,14 @@ $(eval $(call gb_Library_set_include,vclplug_gen,\
     -I$(SRCDIR)/vcl/inc \
     -I$(SRCDIR)/vcl/inc/pch \
     -I$(SRCDIR)/solenv/inc \
-    -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
 ))
 
+$(eval $(call gb_Library_add_api,vclplug_gen,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
     vcl \
     tl \
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index 838df57..da001a2 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_include,vclplug_gtk,\
     -I$(SRCDIR)/vcl/inc \
     -I$(SRCDIR)/vcl/inc/pch \
     -I$(SRCDIR)/solenv/inc \
-    -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
 ))
 
@@ -62,6 +61,11 @@ $(eval $(call gb_Library_set_ldflags,vclplug_gtk,\
 ))
 endif
 
+$(eval $(call gb_Library_add_api,vclplug_gtk,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_set_ldflags,vclplug_gtk,\
     $$(LDFLAGS) \
     $$(GTK_LIBS) \
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index efb134d..bcec467 100644
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_include,vclplug_kde,\
     -I$(SRCDIR)/vcl/inc \
     -I$(SRCDIR)/vcl/inc/pch \
     -I$(SRCDIR)/solenv/inc \
-    -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
 ))
 
@@ -46,6 +45,11 @@ $(eval $(call gb_Library_set_defs,vclplug_kde,\
     -DVCLPLUG_KDE_IMPLEMENTATION \
 ))
 
+$(eval $(call gb_Library_add_api,vclplug_kde,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_set_ldflags,vclplug_kde,\
     $$(KDE_LIBS)\
     $$(LDFLAGS) \
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index 0f7f3e7..c075ca3 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,vclplug_kde4,\
     -I$(SRCDIR)/vcl/inc \
     -I$(SRCDIR)/vcl/inc/pch \
     -I$(SRCDIR)/solenv/inc \
-    -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
     -I$(WORKDIR)/CustomTarget/vcl/unx/kde4 \
 ))
@@ -49,6 +48,11 @@ $(eval $(call gb_Library_set_defs,vclplug_kde4,\
     -DVCLPLUG_KDE4_IMPLEMENTATION \
 ))
 
+$(eval $(call gb_Library_add_api,vclplug_kde4,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_set_ldflags,vclplug_kde4,\
     $$(KDE4_LIBS)\
     $$(LDFLAGS) \
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
index 5ba89f3..8c222ad 100644
--- a/vcl/Library_vclplug_svp.mk
+++ b/vcl/Library_vclplug_svp.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_include,vclplug_svp,\
     -I$(SRCDIR)/vcl/inc \
     -I$(SRCDIR)/vcl/inc/pch \
     -I$(SRCDIR)/solenv/inc \
-    -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
 ))
 
@@ -41,6 +40,11 @@ $(eval $(call gb_Library_set_defs,vclplug_svp,\
     -DVCLPLUG_SVP_IMPLEMENTATION \
 ))
 
+$(eval $(call gb_Library_add_api,vclplug_svp,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,vclplug_svp,\
     vcl \
     vclplug_gen \
diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk
index 044ce10..1b6496c 100644
--- a/vcl/StaticLibrary_vclmain.mk
+++ b/vcl/StaticLibrary_vclmain.mk
@@ -32,10 +32,13 @@ $(eval $(call gb_StaticLibrary_set_include,vclmain,\
     -I$(realpath $(SRCDIR)/vcl/inc) \
     -I$(realpath $(SRCDIR)/vcl/inc/pch) \
     -I$(SRCDIR)/solenv/inc \
-    -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
 ))
 
+$(eval $(call gb_StaticLibrary_add_api,vclmain,\
+    udkapi \
+))
+
 $(eval $(call gb_StaticLibrary_add_exception_objects,vclmain,\
     vcl/source/salmain/salmain \
 ))
commit e18c853df234a3e05eaf33cb6782d95cc2b70129
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date:   Mon May 30 18:09:09 2011 +0200

    ause130: #i117218# change .idl handling to gnu make

diff --git a/basegfx/prj/build.lst b/basegfx/prj/build.lst
index fe3354b..01a39b6 100644
--- a/basegfx/prj/build.lst
+++ b/basegfx/prj/build.lst
@@ -1,4 +1,4 @@
-fx	basegfx	:	o3tl sal offuh cppuhelper cppu CPPUNIT:cppunit NULL
+fx	basegfx	:	o3tl sal offapi cppuhelper cppu CPPUNIT:cppunit NULL
 fx	basegfx									usr1	-	all	fx_mkout NULL
 fx	basegfx\inc								nmake	-	all	fx_inc NULL
 fx	basegfx\prj								get		-	all	fx_prj NULL
diff --git a/canvas/prj/build.lst b/canvas/prj/build.lst
index 121be38..dad6e28 100644
--- a/canvas/prj/build.lst
+++ b/canvas/prj/build.lst
@@ -1,4 +1,4 @@
-cv	canvas	:	javaunohelper comphelper cppuhelper offuh unoil tools svtools vcl basegfx CAIRO:cairo LIBXSLT:libxslt NULL
+cv	canvas	:	javaunohelper comphelper cppuhelper offapi unoil tools svtools vcl basegfx CAIRO:cairo LIBXSLT:libxslt NULL
 cv	canvas											 usr1	-	all	cv_mkout NULL
 cv	canvas\inc										 nmake	-	all	cv_inc NULL
 cv	canvas\source\tools								 nmake	-	all cv_tools cv_inc NULL
diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk
index 8336b8c..64c58cc 100644
--- a/comphelper/Library_comphelp.mk
+++ b/comphelper/Library_comphelp.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_Library_set_include,comphelper,\
     -I$(realpath $(SRCDIR)/comphelper/inc/pch) \
     -I$(realpath $(SRCDIR)/comphelper/source/inc) \
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,comphelper,\
@@ -53,6 +52,11 @@ $(eval $(call gb_Library_add_linked_libs,comphelper,\
     $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_api,comphelper,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Library_add_exception_objects,comphelper,\
     comphelper/source/compare/AnyCompareFactory \
     comphelper/source/container/IndexedPropertyValuesContainer \
diff --git a/comphelper/prj/build.lst b/comphelper/prj/build.lst
index a828870..7dde46c 100644
--- a/comphelper/prj/build.lst
+++ b/comphelper/prj/build.lst
@@ -1,2 +1,2 @@
-ph	comphelper	:	cppuhelper ucbhelper offuh salhelper LIBXSLT:libxslt NULL
+ph	comphelper	:	cppuhelper ucbhelper offapi salhelper LIBXSLT:libxslt NULL
 ch comphelper\prj nmake - all ch_all NULL
diff --git a/cppcanvas/prj/build.lst b/cppcanvas/prj/build.lst
index 317e327..143af13 100644
--- a/cppcanvas/prj/build.lst
+++ b/cppcanvas/prj/build.lst
@@ -1,4 +1,4 @@
-cx	cppcanvas	:	comphelper cppuhelper offuh tools vcl basegfx canvas NULL
+cx	cppcanvas	:	comphelper cppuhelper offapi tools vcl basegfx canvas NULL
 cx	cppcanvas							usr1	-	all	cx_mkout NULL
 cx	cppcanvas\inc						nmake	-	all	cx_inc NULL
 cx	cppcanvas\source\tools				nmake	-	all	cx_tools cx_inc NULL
diff --git a/dtrans/prj/build.lst b/dtrans/prj/build.lst
index f93333f..519e1fd 100644
--- a/dtrans/prj/build.lst
+++ b/dtrans/prj/build.lst
@@ -1,4 +1,4 @@
-dr	dtrans	:	unotools offapi offuh DESKTOP:rdbmaker stoc LIBXSLT:libxslt NULL
+dr	dtrans	:	unotools offapi DESKTOP:rdbmaker stoc LIBXSLT:libxslt NULL
 dr	dtrans									usr1	-	all	dr_mkout NULL
 dr	dtrans\inc								nmake	-	all	dr_inc NULL
 dr	dtrans\source\cnttype					nmake	-	all	dr_cnttype dr_generic dr_inc NULL
diff --git a/i18nutil/prj/build.lst b/i18nutil/prj/build.lst
index 311b6d5..55c86ad 100644
--- a/i18nutil/prj/build.lst
+++ b/i18nutil/prj/build.lst
@@ -1,3 +1,3 @@
-inu  i18nutil    :   sal cppu offuh NULL
+inu  i18nutil    :   sal cppu offapi NULL
 inu  i18nutil                                   usr1    -   all inu_mkout NULL
 inu  i18nutil\source\utility                    nmake   -   all inu_utility NULL
diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk
index bcb69b2..4ec56f2 100644
--- a/padmin/Executable_spadmin.bin.mk
+++ b/padmin/Executable_spadmin.bin.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Executable_Executable,spadmin.bin))
 $(eval $(call gb_Executable_set_include,spadmin.bin,\
     $$(INCLUDE) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Executable_set_cxxflags,spadmin.bin,\
@@ -41,6 +40,11 @@ $(eval $(call gb_Executable_add_linked_static_libs,spadmin.bin,\
     vclmain \
 ))
 
+$(eval $(call gb_Executable_add_api,spadmin.bin,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Executable_add_linked_libs,spadmin.bin,\
     spa \
     svt \
diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk
index 3cd9dc7..e72c676 100644
--- a/padmin/Library_spa.mk
+++ b/padmin/Library_spa.mk
@@ -27,16 +27,16 @@
 
 $(eval $(call gb_Library_Library,spa))
 
-$(eval $(call gb_Library_set_include,spa,\
-    $$(INCLUDE) \
-    -I$(OUTDIR)/inc/offuh \
-))
-
 $(eval $(call gb_Library_set_defs,spa,\
     $$(DEFS) \
     -DSPA_DLLIMPLEMENTATION \
 ))
 
+$(eval $(call gb_Library_add_api,spa,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,spa,\
     svt \
     vcl \
diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk
index 5167953..927fdc0 100644
--- a/sot/Library_sot.mk
+++ b/sot/Library_sot.mk
@@ -36,7 +36,11 @@ $(eval $(call gb_Library_set_componentfile,sot,sot/util/sot))
 $(eval $(call gb_Library_set_include,sot,\
     -I$(realpath $(SRCDIR)/sot/inc/pch) \
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,sot,\
+	udkapi \
+	offapi \
 ))
 
 $(eval $(call gb_Library_set_defs,sot,\
diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index 3e27ae8..121049b 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -37,10 +37,14 @@ $(eval $(call gb_Library_set_include,fsstorage,\
     -I$(realpath $(SRCDIR)/svl/inc/svl) \
     -I$(realpath $(SRCDIR)/svl/source/inc) \
     -I$(realpath $(SRCDIR)/svl/inc/pch) \
-    -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
 ))
 
+$(eval $(call gb_Library_add_api,fsstorage,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,fsstorage,\
     comphelper \
     cppu \
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index 58b4b6e..3826dca 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -37,10 +37,14 @@ $(eval $(call gb_Library_set_include,passwordcontainer,\
     -I$(realpath $(SRCDIR)/svl/inc/svl) \
     -I$(realpath $(SRCDIR)/svl/source/inc) \
     -I$(realpath $(SRCDIR)/svl/inc/pch) \
-    -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
 ))
 
+$(eval $(call gb_Library_add_api,passwordcontainer,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
     cppu \
     cppuhelper \
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index 246530a..638ab9c 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -37,7 +37,12 @@ $(eval $(call gb_Library_set_include,svl,\
     $$(SOLARINC) \
     -I$(realpath $(SRCDIR)/svl/source/inc) \
     -I$(realpath $(SRCDIR)/svl/inc/pch) \
-    -I$(OUTDIR)/inc/offuh \
+	-I$(SRCDIR)/svl/inc/pch \
+))
+
+$(eval $(call gb_Library_add_api,svl,\
+	udkapi \
+	offapi \
 ))
 
 $(eval $(call gb_Library_set_defs,svl,\
diff --git a/svl/prj/build.lst b/svl/prj/build.lst
index 58c1505..5fc7d0e 100644
--- a/svl/prj/build.lst
+++ b/svl/prj/build.lst
@@ -1,3 +1,3 @@
-sl	svl	:	TRANSLATIONS:translations DESKTOP:rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot  LIBXSLT:libxslt NULL
+sl	svl	:	TRANSLATIONS:translations DESKTOP:rsc offapi ucbhelper unotools cppu cppuhelper comphelper sal sot  LIBXSLT:libxslt NULL
 sl	svl\prj	nmake	-	all	svl_prj NULL
 # sl	svl\qa\unit	nmake	-	all	svl_qa_cppunit svl_util NULL
diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk
index 3b2fd2a..f05013d 100644
--- a/svtools/Executable_bmp.mk
+++ b/svtools/Executable_bmp.mk
@@ -36,7 +36,11 @@ $(eval $(call gb_Executable_set_include,bmp,\
     -I$(realpath $(SRCDIR)/svtools/inc/svtools) \
     -I$(realpath $(SRCDIR)/svtools/source/inc) \
     -I$(realpath $(SRCDIR)/svtools/inc/pch) \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Executable_add_api,bmp,\
+	udkapi \
+	offapi \
 ))
 
 $(eval $(call gb_Executable_add_linked_libs,bmp,\
diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk
index 492dabe..1bef32c 100644
--- a/svtools/Executable_bmpsum.mk
+++ b/svtools/Executable_bmpsum.mk
@@ -30,12 +30,16 @@ $(eval $(call gb_Executable_Executable,bmpsum))
 $(eval $(call gb_Executable_set_include,bmpsum,\
     $$(INCLUDE) \
     -I$(OUTDIR)/inc/ \
-    -I$(OUTDIR)/inc/offuh/ \
     -I$(realpath $(SRCDIR)/svtools/inc) \
     -I$(realpath $(SRCDIR)/svtools/inc/pch) \
     -I$(realpath $(SRCDIR)/svtools/inc/svtools) \
 ))
 
+$(eval $(call gb_Executable_add_api,bmpsum,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Executable_add_linked_libs,bmpsum,\
     sal \
     tl \
diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk
index c817cff..c41dae7 100644
--- a/svtools/Executable_g2g.mk
+++ b/svtools/Executable_g2g.mk
@@ -30,12 +30,16 @@ $(eval $(call gb_Executable_Executable,g2g))
 $(eval $(call gb_Executable_set_include,g2g,\
     $$(INCLUDE) \
     -I$(OUTDIR)/inc/ \
-    -I$(OUTDIR)/inc/offuh/ \
     -I$(realpath $(SRCDIR)/svtools/inc) \
     -I$(realpath $(SRCDIR)/svtools/inc/pch) \
     -I$(realpath $(SRCDIR)/svtools/inc/svtools) \
 ))
 
+$(eval $(call gb_Executable_add_api,g2g,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Executable_add_linked_libs,g2g,\
     jvmfwk \
     sal \
diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk
index 96e8f10..91b9226 100644
--- a/svtools/Library_hatchwindowfactory.mk
+++ b/svtools/Library_hatchwindowfactory.mk
@@ -36,10 +36,14 @@ $(eval $(call gb_Library_set_include,hatchwindowfactory,\
     -I$(realpath $(SRCDIR)/svtools/inc/pch) \
     -I$(OUTDIR)/inc/ \
     -I$(realpath $(SRCDIR)/svtools/inc) \
-    -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
 ))
 
+$(eval $(call gb_Library_add_api,hatchwindowfactory,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
     cppu \
     cppuhelper \
diff --git a/svtools/Library_productregistration.mk b/svtools/Library_productregistration.mk
index 726e5a3..44867f4 100644
--- a/svtools/Library_productregistration.mk
+++ b/svtools/Library_productregistration.mk
@@ -36,10 +36,14 @@ $(eval $(call gb_Library_set_include,productregistration,\
     -I$(realpath $(SRCDIR)/svtools/inc/pch) \
     -I$(OUTDIR)/inc/ \
     -I$(realpath $(SRCDIR)/svtools/inc) \
-    -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
 ))
 
+$(eval $(call gb_Library_add_api,productregistration,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,productregistration,\
     cppu \
     cppuhelper \
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index def31f0..2dee92a 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -33,17 +33,21 @@ $(eval $(call gb_Library_add_precompiled_header,svt,$(SRCDIR)/svtools/inc/pch/pr
 
 $(eval $(call gb_Library_set_componentfile,svt,svtools/util/svt))
 
+$(eval $(call gb_Library_add_api,svt,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Library_set_include,svt,\
     -I$(OUTDIR)/inc/external/jpeg \
     $$(INCLUDE) \
     -I$(WORKDIR)/inc/svtools \
     -I$(WORKDIR)/inc/ \
     -I$(OUTDIR)/inc/ \
-    -I$(realpath $(SRCDIR)/svtools/inc) \
     -I$(realpath $(SRCDIR)/svtools/inc/svtools) \
     -I$(realpath $(SRCDIR)/svtools/source/inc) \
     -I$(realpath $(SRCDIR)/svtools/inc/pch) \
-    -I$(OUTDIR)/inc/offuh \
+    -I$(realpath $(SRCDIR)/svtools/inc) \
 ))
 
 $(eval $(call gb_Library_set_defs,svt,\
diff --git a/svtools/prj/build.lst b/svtools/prj/build.lst
index 7ac223a..a438456 100644
--- a/svtools/prj/build.lst
+++ b/svtools/prj/build.lst
@@ -1,2 +1,2 @@
-st	svtools	:	TRANSLATIONS:translations svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal salhelper sot jvmfwk LIBXSLT:libxslt NULL
+st	svtools	:	TRANSLATIONS:translations svl offapi toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal salhelper sot jvmfwk LIBXSLT:libxslt NULL
 st	svtools\prj					        nmake	-	all	st_prj NULL
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 1a94bbd..84c05eb 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_set_include,tk,\
     -I$(realpath $(SRCDIR)/toolkit/inc) \
     -I$(realpath $(SRCDIR)/toolkit/inc/pch) \
     -I$(realpath $(SRCDIR)/toolkit/source) \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,tk,\
@@ -46,6 +45,11 @@ $(eval $(call gb_Library_set_defs,tk,\
     -DTOOLKIT_DLLIMPLEMENTATION \
 ))
 
+$(eval $(call gb_Library_add_api,tk,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,tk,\
     comphelper \
     cppu \
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index da3e027..ad3c9c4 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_set_include,tl,\
     -I$(realpath $(SRCDIR)/tools/inc/pch) \
     -I$(SRCDIR)/solenv/inc \
     -I$(SRCDIR)/solenv/inc/Xp31 \
-    -I$(OUTDIR)/inc/offuh \
     -I$(WORKDIR)/CustomTarget/tools/source/reversemap \
 ))
 
@@ -48,6 +47,11 @@ $(eval $(call gb_Library_set_defs,tl,\
     -DVCL \
 ))
 
+$(eval $(call gb_Library_add_api,tl,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,tl,\
     basegfx \
     comphelper \
diff --git a/tools/StaticLibrary_ooopathutils.mk b/tools/StaticLibrary_ooopathutils.mk
index e58becb..c5b2ea6 100644
--- a/tools/StaticLibrary_ooopathutils.mk
+++ b/tools/StaticLibrary_ooopathutils.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,ooopathutils,\
 # Instead of this evil linking of an object from $(OUTDIR)
 define StaticLibrary_ooopathutils_hack
 $(call gb_StaticLibrary_get_target,ooopathutils) : $(OUTDIR)/lib/$(1)
-$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,tools/source/misc/pathutils)))
+$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,tools/source/misc/pathutils),$(1)))
 
 $(OUTDIR)/lib/$(1) : $(call gb_CxxObject_get_target,tools/source/misc/pathutils)
 	$$(call gb_Deliver_deliver,$$<,$$@)
diff --git a/tools/prj/build.lst b/tools/prj/build.lst
index eeb470c..ee68035 100644
--- a/tools/prj/build.lst
+++ b/tools/prj/build.lst
@@ -1,3 +1,3 @@
-tl tools : cppu external offuh ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL
+tl tools : cppu external offapi ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL
 tl tools\prj nmake - all tl_prj NULL
 # tl	tools\qa					nmake	-	all	tl_qa tl_utl NULL
diff --git a/ucbhelper/prj/build.lst b/ucbhelper/prj/build.lst
index bbd01df..f971733 100644
--- a/ucbhelper/prj/build.lst
+++ b/ucbhelper/prj/build.lst
@@ -1,4 +1,4 @@
-uh	ucbhelper   :   offuh sal cppu cppuhelper salhelper NULL
+uh	ucbhelper   :   offapi sal cppu cppuhelper salhelper NULL
 uh	ucbhelper                   usr1    -   all uh_mkout NULL
 uh	ucbhelper\inc               nmake   -   all uh_inc NULL
 uh	ucbhelper\source\client     nmake   -   all uh_client uh_inc NULL
diff --git a/unotools/prj/build.lst b/unotools/prj/build.lst
index b7883fa..8e18291 100644
--- a/unotools/prj/build.lst
+++ b/unotools/prj/build.lst
@@ -1,3 +1,3 @@
-ut     unotools        : LIBXSLT:libxslt comphelper cppuhelper offuh tools ucbhelper NULL
+ut     unotools        : LIBXSLT:libxslt comphelper cppuhelper offapi tools ucbhelper NULL
 ut     unotools\prj                                                  nmake   -       all     ut_prj NULL
 
diff --git a/vcl/prj/build.lst b/vcl/prj/build.lst
index 1b32995..6db5d66 100644
--- a/vcl/prj/build.lst
+++ b/vcl/prj/build.lst
@@ -1,4 +1,4 @@
-vc	vcl	:	TRANSLATIONS:translations apple_remote BOOST:boost DESKTOP:rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools DESKTOP:l10ntools icc cpputools svl LIBXSLT:libxslt NULL
+vc	vcl	:	TRANSLATIONS:translations apple_remote BOOST:boost DESKTOP:rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offapi basegfx basebmp tools l10ntools icc cpputools svl LIBXSLT:libxslt NULL
 vc	vcl										usr1	-	all	vc_mkout NULL
 vc	vcl\prj									nmake	-	all	vc_prj NULL
 
