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

2011-05-30 18:09:09 +02:00 · 2011-05-30 18:09:09 +02:00 · 0e6ab013f7
commit 0e6ab013f7
parent 190ae222e6
28 changed files with 90 additions and 33 deletions
--- 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
--- 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
--- 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 \
--- 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
--- 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
--- 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
--- 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
--- 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 \
--- 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 \
--- 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,\
--- 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 \
--- 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 \
--- 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,\
--- 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
--- 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,\
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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,\
--- 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
--- 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 \
--- 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 \
--- 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,$$<,$$@)
--- 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
--- 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
--- 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

--- 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