make gbuild the default assumption of build.pl

this removes dmake completely out of the build for migrated modules build.pl now assumes modules to be gbuild, unless there is a prj/dmake file Change-Id: I674a036b182ee13c5ec093e83cb3d38133112d3b
2012-04-28 13:04:45 +02:00 · 2012-04-28 13:04:45 +02:00 · b1c3e8ae28
commit b1c3e8ae28
parent 6963de9536
217 changed files with 3 additions and 170 deletions
--- a/3
+++ b/3
@ -415,7 +415,8 @@ ifeq ($(DISABLE_DBCONNECTIVITY),TRUE)
 	cd connectivity && sed -e 's/^\(export [A-Z0-9_]*=\)\(.*\)$$/\1"\2"/' <../config_host.mk >conftmp.sh && . conftmp.sh && rm conftmp.sh && $(SOLARENV)/bin/deliver.pl
 endif
 	cd packimages && unset MAKEFLAGS && \
-        $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
+		$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) && \
+		make

 build: build-packimages
 ifeq ($(OS_FOR_BUILD),WNT)
--- a/MathMLDTD/prj/makefile.mk
+++ b/MathMLDTD/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/Mesa/prj/makefile.mk
+++ b/Mesa/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/UnoControls/prj/makefile.mk
+++ b/UnoControls/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/accessibility/prj/makefile.mk
+++ b/accessibility/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/afms/prj/dmake
+++ b/afms/prj/dmake
--- a/animations/prj/makefile.mk
+++ b/animations/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/apache-commons/prj/dmake
+++ b/apache-commons/prj/dmake
--- a/apple_remote/prj/makefile.mk
+++ b/apple_remote/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/autodoc/prj/dmake
+++ b/autodoc/prj/dmake
--- a/avmedia/prj/makefile.mk
+++ b/avmedia/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/basctl/prj/makefile.mk
+++ b/basctl/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/basebmp/prj/makefile.mk
+++ b/basebmp/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/basegfx/prj/makefile.mk
+++ b/basegfx/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/basic/prj/makefile.mk
+++ b/basic/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/bean/prj/makefile.mk
+++ b/bean/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/beanshell/prj/dmake
+++ b/beanshell/prj/dmake
--- a/berkeleydb/prj/dmake
+++ b/berkeleydb/prj/dmake
--- a/binaryurp/prj/makefile.mk
+++ b/binaryurp/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/boost/prj/dmake
+++ b/boost/prj/dmake
--- a/bridges/prj/dmake
+++ b/bridges/prj/dmake
--- a/cairo/prj/dmake
+++ b/cairo/prj/dmake
--- a/canvas/prj/makefile.mk
+++ b/canvas/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/chart2/prj/makefile.mk
+++ b/chart2/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/cli_ure/prj/dmake
+++ b/cli_ure/prj/dmake
--- a/clucene/prj/makefile.mk
+++ b/clucene/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/codemaker/prj/makefile.mk
+++ b/codemaker/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/comphelper/prj/makefile.mk
+++ b/comphelper/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/configmgr/prj/makefile.mk
+++ b/configmgr/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/connectivity/prj/dmake
+++ b/connectivity/prj/dmake
--- a/cosv/prj/dmake
+++ b/cosv/prj/dmake
--- a/cppcanvas/prj/makefile.mk
+++ b/cppcanvas/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/cppu/prj/makefile.mk
+++ b/cppu/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/cppuhelper/prj/makefile.mk
+++ b/cppuhelper/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/cppunit/prj/dmake
+++ b/cppunit/prj/dmake
--- a/cpputools/prj/makefile.mk
+++ b/cpputools/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/crashrep/prj/dmake
+++ b/crashrep/prj/dmake
--- a/cross_toolset/prj/dmake
+++ b/cross_toolset/prj/dmake
--- a/ct2n/prj/dmake
+++ b/ct2n/prj/dmake
--- a/cui/prj/makefile.mk
+++ b/cui/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/curl/prj/dmake
+++ b/curl/prj/dmake
--- a/dbaccess/prj/makefile.mk
+++ b/dbaccess/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/desktop/prj/makefile.mk
+++ b/desktop/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/drawinglayer/prj/makefile.mk
+++ b/drawinglayer/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/dtrans/prj/makefile.mk
+++ b/dtrans/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/editeng/prj/makefile.mk
+++ b/editeng/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/embeddedobj/prj/makefile.mk
+++ b/embeddedobj/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/embedserv/prj/makefile.mk
+++ b/embedserv/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/epm/prj/dmake
+++ b/epm/prj/dmake
--- a/eventattacher/prj/makefile.mk
+++ b/eventattacher/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/expat/prj/dmake
+++ b/expat/prj/dmake
--- a/extensions/prj/makefile.mk
+++ b/extensions/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/external/prj/dmake
+++ b/external/prj/dmake
--- a/extras/prj/dmake
+++ b/extras/prj/dmake
--- a/fileaccess/prj/makefile.mk
+++ b/fileaccess/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/filter/prj/makefile.mk
+++ b/filter/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/fontconfig/prj/dmake
+++ b/fontconfig/prj/dmake
--- a/forms/prj/makefile.mk
+++ b/forms/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/formula/prj/makefile.mk
+++ b/formula/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/fpicker/prj/makefile.mk
+++ b/fpicker/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/framework/prj/makefile.mk
+++ b/framework/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/freetype/prj/dmake
+++ b/freetype/prj/dmake
--- a/gdk-pixbuf/prj/dmake
+++ b/gdk-pixbuf/prj/dmake
--- a/gettext/prj/dmake
+++ b/gettext/prj/dmake
--- a/glib/prj/dmake
+++ b/glib/prj/dmake
--- a/graphite/prj/dmake
+++ b/graphite/prj/dmake
--- a/hsqldb/prj/dmake
+++ b/hsqldb/prj/dmake
--- a/hunspell/prj/dmake
+++ b/hunspell/prj/dmake
--- a/hwpfilter/prj/makefile.mk
+++ b/hwpfilter/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/hyphen/prj/dmake
+++ b/hyphen/prj/dmake
--- a/i18npool/prj/makefile.mk
+++ b/i18npool/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/i18nutil/prj/makefile.mk
+++ b/i18nutil/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/icc/prj/dmake
+++ b/icc/prj/dmake
--- a/icu/prj/dmake
+++ b/icu/prj/dmake
--- a/idl/prj/makefile.mk
+++ b/idl/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/idl/source/prj/makefile.mk
+++ b/idl/source/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/idlc/prj/makefile.mk
+++ b/idlc/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/instsetoo_native/prj/dmake
+++ b/instsetoo_native/prj/dmake
--- a/io/prj/makefile.mk
+++ b/io/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/javaunohelper/prj/makefile.mk
+++ b/javaunohelper/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/jfreereport/prj/dmake
+++ b/jfreereport/prj/dmake
--- a/jpeg/prj/dmake
+++ b/jpeg/prj/dmake
--- a/jurt/prj/makefile.mk
+++ b/jurt/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/jvmaccess/prj/makefile.mk
+++ b/jvmaccess/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/jvmfwk/prj/makefile.mk
+++ b/jvmfwk/prj/makefile.mk
@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
--- a/l10ntools/prj/dmake
+++ b/l10ntools/prj/dmake
--- a/languagetool/prj/dmake
+++ b/languagetool/prj/dmake
--- a/lcms2/prj/dmake
+++ b/lcms2/prj/dmake
--- a/libcdr/prj/dmake
+++ b/libcdr/prj/dmake
--- a/libcmis/prj/dmake
+++ b/libcmis/prj/dmake
--- a/libcroco/prj/dmake
+++ b/libcroco/prj/dmake
--- a/libexttextcat/prj/dmake
+++ b/libexttextcat/prj/dmake
--- a/libgsf/prj/dmake
+++ b/libgsf/prj/dmake
--- a/libpng/prj/dmake
+++ b/libpng/prj/dmake
--- a/librsvg/prj/dmake
+++ b/librsvg/prj/dmake
--- a/libvisio/prj/dmake
+++ b/libvisio/prj/dmake
--- a/libwpd/prj/dmake
+++ b/libwpd/prj/dmake
--- a/libwpg/prj/dmake
+++ b/libwpg/prj/dmake
--- a/libwps/prj/dmake
+++ b/libwps/prj/dmake
--- a/libxml2/prj/dmake
+++ b/libxml2/prj/dmake
--- a/Show more
+++ b/Show more