remove all traces of offuh from makefiles

6 files changed, 30 insertions, 6 deletions

diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk
index 7aab083fe94a..30a972925709 100644
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/drawinglayer/Library_drawinglayer.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,drawinglayer,\
     $$(INCLUDE) \
     -I$(realpath $(SRCDIR)/drawinglayer/inc/pch) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,drawinglayer,\
@@ -43,6 +42,11 @@ $(eval $(call gb_Library_set_defs,drawinglayer,\
 	-DDRAWINGLAYER_DLLIMPLEMENTATION \
 ))
 
+$(eval $(call gb_Library_add_api,drawinglayer,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,drawinglayer,\
     avmedia \
     basegfx \
diff --git a/editeng/CppunitTest_editeng_borderline.mk b/editeng/CppunitTest_editeng_borderline.mk
index 6a8e8472766b..3a3a1882b502 100755
--- a/editeng/CppunitTest_editeng_borderline.mk
+++ b/editeng/CppunitTest_editeng_borderline.mk
@@ -57,8 +57,12 @@ $(eval $(call gb_CppunitTest_add_linked_libs,editeng_borderline, \
 
 $(eval $(call gb_CppunitTest_set_include,editeng_borderline,\
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
 ))
 
+$(eval $(call gb_CppunitTest_add_api,editeng_borderline,\
+    offapi \
+    udkapi \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/fileaccess/Library_fileacc.mk b/fileaccess/Library_fileacc.mk
index b6694e6453ad..6fb3bcb7a2d5 100644
--- a/fileaccess/Library_fileacc.mk
+++ b/fileaccess/Library_fileacc.mk
@@ -30,10 +30,14 @@ $(eval $(call gb_Library_Library,fileacc))
 
 $(eval $(call gb_Library_set_include,fileacc,\
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
 ))
 
+$(eval $(call gb_Library_add_api,fileacc,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,fileacc,\
     cppu \
     cppuhelper \
diff --git a/formula/Library_for.mk b/formula/Library_for.mk
index f1ac2c82fdbe..b07780880bbc 100644
--- a/formula/Library_for.mk
+++ b/formula/Library_for.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_set_include,for,\
     -I$(realpath $(SRCDIR)/formula/inc/pch) \
     -I$(realpath $(SRCDIR)/formula/source/core/inc) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,for,\
@@ -46,6 +45,11 @@ $(eval $(call gb_Library_set_defs,for,\
     -DFORMULA_DLLIMPLEMENTATION \
 ))
 
+$(eval $(call gb_Library_add_api,for,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,for,\
     comphelper \
     cppu \
diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk
index 0b77c702e9d4..c957c3927564 100644
--- a/formula/Library_forui.mk
+++ b/formula/Library_forui.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,forui,\
     -I$(realpath $(SRCDIR)/formula/inc/pch) \
     -I$(realpath $(SRCDIR)/formula/source/ui/inc) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,forui,\
@@ -43,6 +42,11 @@ $(eval $(call gb_Library_set_defs,forui,\
     -DFORMULA_DLLIMPLEMENTATION \
 ))
 
+$(eval $(call gb_Library_add_api,forui,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,forui,\
     cppu \
     cppuhelper \
diff --git a/framework/Library_lomenubar.mk b/framework/Library_lomenubar.mk
index e8fe7c6ffb28..dd3848ef3fb8 100644
--- a/framework/Library_lomenubar.mk
+++ b/framework/Library_lomenubar.mk
@@ -33,10 +33,14 @@ $(eval $(call gb_Library_set_componentfile,lomenubar,framework/util/lomenubar))
 
 $(eval $(call gb_Library_set_include,lomenubar,\
 	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/offuh \
 	$(shell pkg-config --cflags-only-I dbusmenu-gtk-0.4) \
 ))
 
+$(eval $(call gb_Library_add_api,lomenubar,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_set_ldflags,lomenubar,\
 	$$(LDFLAGS) \
 	$(shell pkg-config --libs dbusmenu-gtk-0.4) \