remove all traces of offuh from makefiles

8 files changed, 40 insertions, 8 deletions

diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
index 0def1a7e3724..c9cb894364c7 100644
--- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
@@ -46,10 +46,14 @@ $(eval $(call gb_CppunitTest_add_linked_libs,lotuswordpro_test_lotuswordpro, \
 
 $(eval $(call gb_CppunitTest_set_include,lotuswordpro_test_lotuswordpro,\
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
 ))
 
+$(eval $(call gb_CppunitTest_add_api,lotuswordpro_test_lotuswordpro,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_CppunitTest_uses_ure,lotuswordpro_test_lotuswordpro))
 
 $(eval $(call gb_CppunitTest_add_type_rdbs,lotuswordpro_test_lotuswordpro,\
diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index db1cf5854e02..988d101f8d89 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -30,7 +30,11 @@ $(eval $(call gb_Library_Library,lwpft))
 $(eval $(call gb_Library_set_include,lwpft,\
     $$(INCLUDE) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,lwpft,\
+    offapi \
+    udkapi \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,lwpft,\
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 99bbdc6a3707..282d84546506 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_add_package_headers,oox,\
 $(eval $(call gb_Library_set_include,oox,\
     $$(INCLUDE) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
     -I$(realpath $(SRCDIR)/oox/inc) \
     $(if $(filter YES,$(SYSTEM_OPENSSL)),$(filter -I%,$(OPENSSL_CFLAGS))) \
 ))
@@ -45,6 +44,11 @@ $(eval $(call gb_Library_set_defs,oox,\
     $(if $(filter YES,$(SYSTEM_OPENSSL)),$(filter-out -I%,$(OPENSSL_CFLAGS))) \
 ))
 
+$(eval $(call gb_Library_add_api,oox,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,oox,\
     basegfx \
     comphelper \
diff --git a/writerfilter/Library_doctok.mk b/writerfilter/Library_doctok.mk
index 2e4afc58e1a0..95eb1fdd3e4f 100644
--- a/writerfilter/Library_doctok.mk
+++ b/writerfilter/Library_doctok.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,doctok,\
     -I$(WORKDIR)/writerfilter/inc/doctok \
 	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
@@ -47,6 +46,11 @@ $(eval $(call gb_Library_set_defs,doctok,\
 	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
 ))
 
+$(eval $(call gb_Library_add_api,doctok,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,doctok,\
     cppu \
     cppuhelper \
diff --git a/writerfilter/Library_ooxml.mk b/writerfilter/Library_ooxml.mk
index e59c93a1144a..e3d06ba6c6c9 100644
--- a/writerfilter/Library_ooxml.mk
+++ b/writerfilter/Library_ooxml.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,ooxml,\
     -I$(WORKDIR)/writerfilter/inc/ooxml \
 	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
@@ -48,6 +47,11 @@ $(eval $(call gb_Library_set_defs,ooxml,\
 	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
 ))
 
+$(eval $(call gb_Library_add_api,ooxml,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,ooxml,\
     comphelper \
     cppu \
diff --git a/writerfilter/Library_resourcemodel.mk b/writerfilter/Library_resourcemodel.mk
index 1ee3c9e2a248..04a1b365a95f 100644
--- a/writerfilter/Library_resourcemodel.mk
+++ b/writerfilter/Library_resourcemodel.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,resourcemodel,\
     -I$(WORKDIR)/writerfilter/inc \
     $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 include $(SRCDIR)/writerfilter/debug_setup.mk
@@ -45,6 +44,11 @@ $(eval $(call gb_Library_set_defs,resourcemodel,\
     $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
 ))
 
+$(eval $(call gb_Library_add_api,resourcemodel,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,resourcemodel,\
     comphelper \
     cppu \
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index 3fe26f625e99..b976faeeb829 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -32,7 +32,11 @@ $(eval $(call gb_Library_set_include,writerfilter,\
     -I$(realpath $(SRCDIR)/writerfilter/inc) \
 	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,writerfilter,\
+    offapi \
+    udkapi \
 ))
 
 $(eval $(call gb_Library_set_componentfile,writerfilter,writerfilter/util/writerfilter))
diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk
index 436cd3a0fb69..e6ba6c25e1bf 100644
--- a/writerfilter/Library_writerfilter_uno.mk
+++ b/writerfilter/Library_writerfilter_uno.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_include,writerfilter_uno,\
     -I$(realpath $(SRCDIR)/writerfilter/inc) \
 	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,writerfilter_uno,\
@@ -41,6 +40,11 @@ $(eval $(call gb_Library_set_defs,writerfilter_uno,\
 	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
 ))
 
+$(eval $(call gb_Library_add_api,writerfilter_uno,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,writerfilter_uno,\
     comphelper \
     cppu \