remove all traces of offuh from makefiles

9 files changed, 45 insertions, 9 deletions

diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index 69db5c2b6247..79ebbb4a0877 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_CppunitTest_set_include,sd_uimpress,\
     -I$(realpath $(SRCDIR)/sd/inc) \
     -I$(realpath $(SRCDIR)/sd/inc/pch) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_CppunitTest_set_defs,sd_uimpress,\
@@ -40,6 +39,11 @@ $(eval $(call gb_CppunitTest_set_defs,sd_uimpress,\
     -DSD_DLLIMPLEMENTATION \
 ))
 
+$(eval $(call gb_CppunitTest_add_api,sd_uimpress,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_CppunitTest_add_library_objects,sd_uimpress,sd))
 
 $(eval $(call gb_CppunitTest_add_linked_libs,sd_uimpress,\
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index a96e3b8e2594..99f51e413ab5 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_set_include,sd,\
     -I$(WORKDIR)/inc/sd \
     -I$(WORKDIR)/SdiTarget/sd/sdi \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,sd,\
@@ -59,6 +58,11 @@ $(eval $(call gb_Library_set_defs,sd,\
 ))
 endif
 
+$(eval $(call gb_Library_add_api,sd,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,sd,\
     avmedia \
     basegfx \
diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk
index 894e399639e1..61ae7d3b0248 100644
--- a/sd/Library_sdd.mk
+++ b/sd/Library_sdd.mk
@@ -34,7 +34,11 @@ $(eval $(call gb_Library_set_include,sdd,\
     -I$(realpath $(SRCDIR)/sd/inc) \
     -I$(realpath $(SRCDIR)/sd/inc/pch) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,sdd,\
+    offapi \
+    udkapi \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,sdd,\
diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk
index b1bb3de9a8eb..97fe6b65cd36 100644
--- a/sd/Library_sdfilt.mk
+++ b/sd/Library_sdfilt.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,sdfilt,\
     -I$(realpath $(SRCDIR)/sd/inc) \
     -I$(realpath $(SRCDIR)/sd/inc/pch) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,sdfilt,\
@@ -49,6 +48,11 @@ $(eval $(call gb_Library_set_defs,sdfilt,\
 ))
 endif
 
+$(eval $(call gb_Library_add_api,sdfilt,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,sdfilt,\
     comphelper \
     cppu \
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index e74e965781ac..3b0b0aab0a56 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,sdui,\
     -I$(realpath $(SRCDIR)/sd/inc/pch) \
     -I$(realpath $(SRCDIR)/sd/source/ui/inc) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,sdui,\
@@ -43,6 +42,11 @@ $(eval $(call gb_Library_set_defs,sdui,\
     -DSD_DLLIMPLEMENTATION \
 ))
 
+$(eval $(call gb_Library_add_api,sdui,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,sdui,\
     basegfx \
     comphelper \
diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk
index 3105f9091eed..39675246d319 100644
--- a/slideshow/CppunitTest_slideshow.mk
+++ b/slideshow/CppunitTest_slideshow.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_CppunitTest_set_include,slideshow,\
     -I$(realpath $(SRCDIR)/slideshow/inc/pch) \
     -I$(realpath $(SRCDIR)/slideshow/source/inc) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_CppunitTest_set_defs,slideshow,\
@@ -49,6 +48,11 @@ $(eval $(call gb_CppunitTest_set_defs,slideshow,\
 ))
 endif
 
+$(eval $(call gb_CppunitTest_add_api,slideshow,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_CppunitTest_add_library_objects,slideshow,slideshow))
 
 $(eval $(call gb_CppunitTest_add_linked_libs,slideshow,\
diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk
index 6c54ff5bad01..a50d79aae30b 100644
--- a/slideshow/Executable_demoshow.mk
+++ b/slideshow/Executable_demoshow.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Executable_set_include,demoshow,\
     -I$(realpath $(SRCDIR)/slideshow/inc/pch) \
     -I$(realpath $(SRCDIR)/slideshow/source/inc) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 ifeq ($(strip $(VERBOSE)),TRUE)
@@ -51,6 +50,11 @@ $(eval $(call gb_Executable_set_defs,demoshow,\
 ))
 endif
 
+$(eval $(call gb_Library_add_api,demoshow,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Executable_add_linked_libs,demoshow,\
     basegfx \
     comphelper \
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index 3a04c1e4fcce..eb34b01c4199 100644
--- a/slideshow/Library_OGLTrans.mk
+++ b/slideshow/Library_OGLTrans.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,OGLTrans,\
     $$(INCLUDE) \
     -I$(realpath $(SRCDIR)/slideshow/inc/pch) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 ifeq ($(strip $(VERBOSE)),TRUE)
@@ -50,6 +49,11 @@ $(eval $(call gb_Library_set_defs,OGLTrans,\
 ))
 endif
 
+$(eval $(call gb_Library_add_api,OGLTrans,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,OGLTrans,\
     canvastools \
     comphelper \
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 3823474b2976..d5a1458bd3cd 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,slideshow,\
     -I$(realpath $(SRCDIR)/slideshow/inc/pch) \
     -I$(realpath $(SRCDIR)/slideshow/source/inc) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,slideshow,\
@@ -50,6 +49,11 @@ $(eval $(call gb_Library_set_defs,slideshow,\
 ))
 endif
 
+$(eval $(call gb_Library_add_api,slideshow,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,slideshow,\
     avmedia \
     basegfx \