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

7 files changed, 32 insertions, 8 deletions

diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk
index 3b2fd2a1203c..f05013df4170 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 492dabeb58f8..1bef32c970de 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 c817cff43ccd..c41dae777dbd 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 96e8f10c3306..91b92267ddd5 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 726e5a3b664b..44867f4530e3 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 def31f0d121f..2dee92a7dceb 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 7ac223ae1588..a438456220a0 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