Sat Apr 28 18:50:55 PDT 2012

Makefile                            |    3 +-
 MathMLDTD/prj/makefile.mk           |    1 
 Mesa/prj/makefile.mk                |    1 
 UnoControls/prj/makefile.mk         |    1 
 accessibility/prj/makefile.mk       |    1 
 animations/prj/makefile.mk          |    1 
 apple_remote/prj/makefile.mk        |    1 
 avmedia/prj/makefile.mk             |    1 
 basctl/prj/makefile.mk              |    1 
 basebmp/prj/makefile.mk             |    1 
 basegfx/prj/makefile.mk             |    1 
 basic/prj/makefile.mk               |    1 
 bean/prj/makefile.mk                |    1 
 binaryurp/prj/makefile.mk           |    1 
 canvas/prj/makefile.mk              |    1 
 chart2/prj/makefile.mk              |    1 
 clucene/prj/makefile.mk             |    1 
 codemaker/prj/makefile.mk           |    1 
 comphelper/prj/makefile.mk          |    1 
 configmgr/prj/makefile.mk           |    1 
 cppcanvas/prj/makefile.mk           |    1 
 cppu/prj/makefile.mk                |    1 
 cppuhelper/prj/build.lst            |    1 
 cppuhelper/prj/makefile.mk          |    1 
 cpputools/prj/makefile.mk           |    1 
 cui/prj/makefile.mk                 |    1 
 dbaccess/prj/makefile.mk            |    1 
 desktop/prj/makefile.mk             |    1 
 drawinglayer/prj/makefile.mk        |    1 
 dtrans/prj/makefile.mk              |    1 
 editeng/prj/makefile.mk             |    1 
 embeddedobj/prj/makefile.mk         |    1 
 embedserv/prj/makefile.mk           |    1 
 eventattacher/prj/makefile.mk       |    1 
 extensions/prj/makefile.mk          |    1 
 fileaccess/prj/makefile.mk          |    1 
 filter/prj/makefile.mk              |    1 
 forms/prj/makefile.mk               |    1 
 formula/prj/makefile.mk             |    1 
 fpicker/prj/makefile.mk             |    1 
 framework/prj/makefile.mk           |    1 
 hwpfilter/prj/makefile.mk           |    1 
 i18npool/prj/makefile.mk            |    1 
 i18nutil/prj/makefile.mk            |    1 
 idl/prj/makefile.mk                 |    1 
 idl/source/prj/makefile.mk          |    1 
 idlc/prj/makefile.mk                |    1 
 io/prj/makefile.mk                  |    1 
 javaunohelper/prj/makefile.mk       |    1 
 jurt/prj/makefile.mk                |    1 
 jvmaccess/prj/makefile.mk           |    1 
 jvmfwk/prj/makefile.mk              |    1 
 libcmis/prj/build.lst               |    2 -
 libcmis/prj/makefile.mk             |    1 
 lingucomponent/prj/makefile.mk      |    1 
 linguistic/prj/makefile.mk          |    1 
 lotuswordpro/prj/makefile.mk        |    1 
 nlpsolver/prj/makefile.mk           |    1 
 np_sdk/prj/makefile.mk              |    1 
 o3tl/prj/makefile.mk                |    1 
 offapi/prj/makefile.mk              |    1 
 officecfg/prj/makefile.mk           |    1 
 oovbaapi/prj/makefile.mk            |    1 
 oox/prj/makefile.mk                 |    1 
 package/prj/makefile.mk             |    1 
 packimages/prj/build.lst            |    1 
 packimages/prj/makefile.mk          |    1 
 padmin/prj/makefile.mk              |    1 
 psprint_config/prj/makefile.mk      |    1 
 qadevOOo/prj/makefile.mk            |    1 
 rdbmaker/prj/makefile.mk            |    1 
 regexp/prj/makefile.mk              |    1 
 reportdesign/prj/makefile.mk        |    1 
 ridljar/prj/makefile.mk             |    1 
 rsc/prj/makefile.mk                 |    1 
 sal/prj/makefile.mk                 |    1 
 salhelper/prj/makefile.mk           |    1 
 sane/prj/makefile.mk                |    1 
 sax/prj/makefile.mk                 |    1 
 sc/prj/makefile.mk                  |    1 
 scaddins/prj/makefile.mk            |    1 
 sccomp/prj/makefile.mk              |    1 
 scripting/prj/makefile.mk           |    1 
 sd/prj/makefile.mk                  |    1 
 sdext/prj/makefile.mk               |    1 
 sfx2/prj/makefile.mk                |    1 
 slideshow/prj/makefile.mk           |    1 
 smoketest/prj/makefile.mk           |    1 
 solenv/bin/build.pl                 |   21 +++++++++++++++-
 solenv/bin/modules/SourceConfig.pm  |    2 -
 solenv/gbuild/templates/makefile.mk |    1 
 solenv/inc/gbuildbridge.mk          |   45 ------------------------------------
 sot/prj/makefile.mk                 |    1 
 starmath/prj/makefile.mk            |    1 
 stoc/prj/makefile.mk                |    1 
 svl/prj/makefile.mk                 |    1 
 svtools/prj/makefile.mk             |    1 
 svx/prj/makefile.mk                 |    1 
 sw/prj/makefile.mk                  |    1 
 swext/prj/makefile.mk               |    1 
 tail_build/prj/makefile.mk          |    5 ----
 test/prj/makefile.mk                |    1 
 toolkit/prj/makefile.mk             |    1 
 tools/prj/makefile.mk               |    1 
 twain/prj/makefile.mk               |    1 
 ucb/prj/makefile.mk                 |    1 
 ucbhelper/prj/makefile.mk           |    1 
 udkapi/prj/makefile.mk              |    1 
 unixODBC/prj/makefile.mk            |    1 
 unodevtools/prj/makefile.mk         |    1 
 unoil/prj/makefile.mk               |    1 
 unotest/prj/makefile.mk             |    1 
 unotools/prj/makefile.mk            |    1 
 unoxml/prj/makefile.mk              |    1 
 ure/prj/makefile.mk                 |    1 
 uui/prj/makefile.mk                 |    1 
 vbahelper/prj/makefile.mk           |    1 
 vcl/prj/makefile.mk                 |    1 
 wizards/prj/makefile.mk             |    1 
 writerfilter/prj/makefile.mk        |    1 
 writerperfect/prj/makefile.mk       |    1 
 xmerge/prj/makefile.mk              |    1 
 xml2cmp/prj/makefile.mk             |    1 
 xmloff/prj/makefile.mk              |    1 
 xmlreader/prj/makefile.mk           |    1 
 xmlscript/prj/makefile.mk           |    1 
 xmlsecurity/prj/makefile.mk         |    1 
 127 files changed, 23 insertions(+), 176 deletions(-)

New commits:
commit b1c3e8ae28fcd84c7182f4898c3250e18ed92f1a
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Apr 28 13:04:45 2012 +0200

    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

diff --git a/Makefile b/Makefile
index d6b06bf..36434eb 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
diff --git a/MathMLDTD/prj/makefile.mk b/MathMLDTD/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/MathMLDTD/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/Mesa/prj/makefile.mk b/Mesa/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/Mesa/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/UnoControls/prj/makefile.mk b/UnoControls/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/UnoControls/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/accessibility/prj/makefile.mk b/accessibility/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/accessibility/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/afms/prj/dmake b/afms/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/animations/prj/makefile.mk b/animations/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/animations/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/apache-commons/prj/dmake b/apache-commons/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/apple_remote/prj/makefile.mk b/apple_remote/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/apple_remote/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/autodoc/prj/dmake b/autodoc/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/avmedia/prj/makefile.mk b/avmedia/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/avmedia/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/basctl/prj/makefile.mk b/basctl/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/basctl/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/basebmp/prj/makefile.mk b/basebmp/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/basebmp/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/basegfx/prj/makefile.mk b/basegfx/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/basegfx/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/basic/prj/makefile.mk b/basic/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/basic/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/bean/prj/makefile.mk b/bean/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/bean/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/beanshell/prj/dmake b/beanshell/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/berkeleydb/prj/dmake b/berkeleydb/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/binaryurp/prj/makefile.mk b/binaryurp/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/binaryurp/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/boost/prj/dmake b/boost/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/bridges/prj/dmake b/bridges/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/cairo/prj/dmake b/cairo/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/canvas/prj/makefile.mk b/canvas/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/canvas/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/chart2/prj/makefile.mk b/chart2/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/chart2/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/cli_ure/prj/dmake b/cli_ure/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/clucene/prj/makefile.mk b/clucene/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/clucene/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/codemaker/prj/makefile.mk b/codemaker/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/codemaker/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/comphelper/prj/makefile.mk b/comphelper/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/comphelper/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/configmgr/prj/makefile.mk b/configmgr/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/configmgr/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/connectivity/prj/dmake b/connectivity/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/cosv/prj/dmake b/cosv/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/cppcanvas/prj/makefile.mk b/cppcanvas/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/cppcanvas/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/cppu/prj/makefile.mk b/cppu/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/cppu/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/cppuhelper/prj/makefile.mk b/cppuhelper/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/cppuhelper/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/cppunit/prj/dmake b/cppunit/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/cpputools/prj/makefile.mk b/cpputools/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/cpputools/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/crashrep/prj/dmake b/crashrep/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/cross_toolset/prj/dmake b/cross_toolset/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/ct2n/prj/dmake b/ct2n/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/cui/prj/makefile.mk b/cui/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/cui/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/curl/prj/dmake b/curl/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/dbaccess/prj/makefile.mk b/dbaccess/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/dbaccess/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/desktop/prj/makefile.mk b/desktop/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/desktop/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/drawinglayer/prj/makefile.mk b/drawinglayer/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/drawinglayer/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/dtrans/prj/makefile.mk b/dtrans/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/dtrans/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/editeng/prj/makefile.mk b/editeng/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/editeng/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/embeddedobj/prj/makefile.mk b/embeddedobj/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/embeddedobj/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/embedserv/prj/makefile.mk b/embedserv/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/embedserv/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/epm/prj/dmake b/epm/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/eventattacher/prj/makefile.mk b/eventattacher/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/eventattacher/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/expat/prj/dmake b/expat/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/extensions/prj/makefile.mk b/extensions/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/extensions/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/external/prj/dmake b/external/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/extras/prj/dmake b/extras/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/fileaccess/prj/makefile.mk b/fileaccess/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/fileaccess/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/filter/prj/makefile.mk b/filter/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/filter/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/fontconfig/prj/dmake b/fontconfig/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/forms/prj/makefile.mk b/forms/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/forms/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/formula/prj/makefile.mk b/formula/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/formula/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/fpicker/prj/makefile.mk b/fpicker/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/fpicker/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/framework/prj/makefile.mk b/framework/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/framework/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/freetype/prj/dmake b/freetype/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/gdk-pixbuf/prj/dmake b/gdk-pixbuf/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/gettext/prj/dmake b/gettext/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/glib/prj/dmake b/glib/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/graphite/prj/dmake b/graphite/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/hsqldb/prj/dmake b/hsqldb/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/hunspell/prj/dmake b/hunspell/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/hwpfilter/prj/makefile.mk b/hwpfilter/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/hwpfilter/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/hyphen/prj/dmake b/hyphen/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/i18npool/prj/makefile.mk b/i18npool/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/i18npool/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/i18nutil/prj/makefile.mk b/i18nutil/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/i18nutil/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/icc/prj/dmake b/icc/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/icu/prj/dmake b/icu/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/idl/prj/makefile.mk b/idl/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/idl/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/idl/source/prj/makefile.mk b/idl/source/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/idl/source/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/idlc/prj/makefile.mk b/idlc/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/idlc/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/instsetoo_native/prj/dmake b/instsetoo_native/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/io/prj/makefile.mk b/io/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/io/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/javaunohelper/prj/makefile.mk b/javaunohelper/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/javaunohelper/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/jfreereport/prj/dmake b/jfreereport/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/jpeg/prj/dmake b/jpeg/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/jurt/prj/makefile.mk b/jurt/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/jurt/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/jvmaccess/prj/makefile.mk b/jvmaccess/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/jvmaccess/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/jvmfwk/prj/makefile.mk b/jvmfwk/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/jvmfwk/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/l10ntools/prj/dmake b/l10ntools/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/languagetool/prj/dmake b/languagetool/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/lcms2/prj/dmake b/lcms2/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/libcdr/prj/dmake b/libcdr/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/libcmis/prj/dmake b/libcmis/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/libcroco/prj/dmake b/libcroco/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/libexttextcat/prj/dmake b/libexttextcat/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/libgsf/prj/dmake b/libgsf/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/libpng/prj/dmake b/libpng/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/librsvg/prj/dmake b/librsvg/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/libvisio/prj/dmake b/libvisio/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/libwpd/prj/dmake b/libwpd/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/libwpg/prj/dmake b/libwpg/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/libwps/prj/dmake b/libwps/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/libxml2/prj/dmake b/libxml2/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/libxmlsec/prj/dmake b/libxmlsec/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/libxslt/prj/dmake b/libxslt/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/lingucomponent/prj/makefile.mk b/lingucomponent/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/lingucomponent/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/linguistic/prj/makefile.mk b/linguistic/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/linguistic/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/lotuswordpro/prj/makefile.mk b/lotuswordpro/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/lotuswordpro/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/lpsolve/prj/dmake b/lpsolve/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/lucene/prj/dmake b/lucene/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/mdds/prj/dmake b/mdds/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/migrationanalysis/prj/dmake b/migrationanalysis/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/more_fonts/prj/dmake b/more_fonts/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/moz/prj/dmake b/moz/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/mysqlc/prj/dmake b/mysqlc/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/mysqlcppconn/prj/dmake b/mysqlcppconn/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/mythes/prj/dmake b/mythes/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/neon/prj/dmake b/neon/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/nlpsolver/prj/makefile.mk b/nlpsolver/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/nlpsolver/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/np_sdk/prj/makefile.mk b/np_sdk/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/np_sdk/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/nss/prj/dmake b/nss/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/o3tl/prj/makefile.mk b/o3tl/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/o3tl/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/odk/prj/dmake b/odk/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/offapi/prj/makefile.mk b/offapi/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/offapi/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/officecfg/prj/makefile.mk b/officecfg/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/officecfg/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/oovbaapi/prj/makefile.mk b/oovbaapi/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/oovbaapi/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/oox/prj/makefile.mk b/oox/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/oox/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/openssl/prj/dmake b/openssl/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/package/prj/makefile.mk b/package/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/package/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/packimages/prj/build.lst b/packimages/prj/build.lst
index 1692481..9cfc160 100644
--- a/packimages/prj/build.lst
+++ b/packimages/prj/build.lst
@@ -1,2 +1 @@
 pim	packimages	::	postprocess NULL
-pim	packimages\prj	nmake - all pim_prj NULL
diff --git a/packimages/prj/makefile.mk b/packimages/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/packimages/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/padmin/prj/makefile.mk b/padmin/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/padmin/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/pango/prj/dmake b/pango/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/postgresql/prj/dmake b/postgresql/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/postprocess/prj/dmake b/postprocess/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/psprint_config/prj/makefile.mk b/psprint_config/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/psprint_config/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/python/prj/dmake b/python/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/pyuno/prj/dmake b/pyuno/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/qadevOOo/prj/makefile.mk b/qadevOOo/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/qadevOOo/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/rdbmaker/prj/makefile.mk b/rdbmaker/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/rdbmaker/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/readlicense_oo/prj/dmake b/readlicense_oo/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/redland/prj/dmake b/redland/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/regexp/prj/makefile.mk b/regexp/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/regexp/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/registry/prj/dmake b/registry/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/remotebridges/prj/dmake b/remotebridges/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/reportbuilder/prj/dmake b/reportbuilder/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/reportdesign/prj/makefile.mk b/reportdesign/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/reportdesign/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/rhino/prj/dmake b/rhino/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/ridljar/prj/makefile.mk b/ridljar/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/ridljar/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/rsc/prj/makefile.mk b/rsc/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/rsc/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/rsc/source/prj/dmake b/rsc/source/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/sal/prj/makefile.mk b/sal/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/sal/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/salhelper/prj/makefile.mk b/salhelper/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/salhelper/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/sane/prj/makefile.mk b/sane/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/sane/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/sax/prj/makefile.mk b/sax/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/sax/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/saxon/prj/dmake b/saxon/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/sc/prj/makefile.mk b/sc/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/sc/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/scaddins/prj/makefile.mk b/scaddins/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/scaddins/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/sccomp/prj/makefile.mk b/sccomp/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/sccomp/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/scp2/prj/dmake b/scp2/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/scripting/prj/makefile.mk b/scripting/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/scripting/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/sd/prj/makefile.mk b/sd/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/sd/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/sdext/prj/makefile.mk b/sdext/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/sdext/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/setup_native/prj/dmake b/setup_native/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/sfx2/prj/makefile.mk b/sfx2/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/sfx2/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/shell/prj/dmake b/shell/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/slideshow/prj/makefile.mk b/slideshow/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/slideshow/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/smoketest/prj/makefile.mk b/smoketest/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/smoketest/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
index b96cde9..ac63f39 100644
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@ -147,7 +147,7 @@ sub get_module_build_list {
         {
             ${$self->{MODULE_BUILD_LIST_PATHS}}{$module} = $module_path . "/prj/build.lst";
 
-            if (-e $module_path . "/prj/makefile.mk" )
+            if (!-e $module_path . "/prj/dmake" )
             {
 #                print "module $module -> gbuild\n";
                 ${$self->{MODULE_GBUILDIFIED}}{$module} = 1;
diff --git a/solenv/inc/gbuildbridge.mk b/solenv/inc/gbuildbridge.mk
deleted file mode 100644
index 88b8dbc..0000000
--- a/solenv/inc/gbuildbridge.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-TARGET=prj
-
-.INCLUDE : settings.mk
-
-.IF "$(GBUILDTARGET)" == ""
-GBUILDTARGET=all slowcheck
-.END
-
-.IF "$(depend)" != ""
-all:
-.ELIF "$(VERBOSE)"!=""
-all:
-	cd $(PRJ) && $(GNUMAKE) -r -j$(GMAKE_MODULE_PARALLELISM) $(GBUILDTARGET)
-.ELSE
-all:
-	@cd $(PRJ) && $(GNUMAKE) -rs -j$(GMAKE_MODULE_PARALLELISM) $(GBUILDTARGET)
-.END
diff --git a/solenv/prj/dmake b/solenv/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/soltools/prj/dmake b/soltools/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/sot/prj/makefile.mk b/sot/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/sot/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/starmath/prj/makefile.mk b/starmath/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/starmath/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/stax/prj/dmake b/stax/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/stlport/prj/dmake b/stlport/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/stoc/prj/makefile.mk b/stoc/prj/makefile.mk
deleted file mode 100755
index 0997622..0000000
--- a/stoc/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/store/prj/dmake b/store/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/svl/prj/makefile.mk b/svl/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/svl/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/svtools/prj/makefile.mk b/svtools/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/svtools/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/svx/prj/makefile.mk b/svx/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/svx/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/sw/prj/makefile.mk b/sw/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/sw/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/swext/prj/makefile.mk b/swext/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/swext/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/sysui/prj/dmake b/sysui/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/tail_build/prj/makefile.mk b/tail_build/prj/makefile.mk
deleted file mode 100644
index bd1791f..0000000
--- a/tail_build/prj/makefile.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-GMAKE_MODULE_PARALLELISM := $(GMAKE_PARALLELISM) # tail_build is special!
-.IF "$(gb_TAILBUILDTARGET)" != ""
-GBUILDTARGET=$(gb_TAILBUILDTARGET)
-.END
-.INCLUDE : gbuildbridge.mk
diff --git a/test/prj/makefile.mk b/test/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/test/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/testtools/prj/dmake b/testtools/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/tomcat/prj/dmake b/tomcat/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/toolkit/prj/makefile.mk b/toolkit/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/toolkit/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/tools/prj/makefile.mk b/tools/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/tools/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/twain/prj/makefile.mk b/twain/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/twain/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/ucb/prj/makefile.mk b/ucb/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/ucb/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/ucbhelper/prj/makefile.mk b/ucbhelper/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/ucbhelper/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/udkapi/prj/makefile.mk b/udkapi/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/udkapi/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/udm/prj/dmake b/udm/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/unixODBC/prj/makefile.mk b/unixODBC/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/unixODBC/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/unodevtools/prj/makefile.mk b/unodevtools/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/unodevtools/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/unoil/prj/makefile.mk b/unoil/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/unoil/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/unotest/prj/makefile.mk b/unotest/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/unotest/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/unotools/prj/makefile.mk b/unotools/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/unotools/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/unoxml/prj/makefile.mk b/unoxml/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/unoxml/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/ure/prj/makefile.mk b/ure/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/ure/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/uui/prj/makefile.mk b/uui/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/uui/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/vbahelper/prj/makefile.mk b/vbahelper/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/vbahelper/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/vcl/prj/makefile.mk b/vcl/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/vcl/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/vigra/prj/dmake b/vigra/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/wizards/prj/makefile.mk b/wizards/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/wizards/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/writerfilter/prj/makefile.mk b/writerfilter/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/writerfilter/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/writerperfect/prj/makefile.mk b/writerperfect/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/writerperfect/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/x11_extensions/prj/dmake b/x11_extensions/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/xmerge/prj/makefile.mk b/xmerge/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/xmerge/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/xml2cmp/prj/makefile.mk b/xml2cmp/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/xml2cmp/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/xmlhelp/prj/dmake b/xmlhelp/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/xmloff/prj/makefile.mk b/xmloff/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/xmloff/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/xmlreader/prj/makefile.mk b/xmlreader/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/xmlreader/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/xmlscript/prj/makefile.mk b/xmlscript/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/xmlscript/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/xmlsecurity/prj/makefile.mk b/xmlsecurity/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/xmlsecurity/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/xpdf/prj/dmake b/xpdf/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/xsltml/prj/dmake b/xsltml/prj/dmake
new file mode 100644
index 0000000..e69de29
diff --git a/zlib/prj/dmake b/zlib/prj/dmake
new file mode 100644
index 0000000..e69de29
commit 6963de9536cfca1145685a611a6c88c5160d9a1c
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Apr 28 13:00:58 2012 +0200

    build gbuild directly from build.pl and fix libcmis and respect GMAKE_OPTIONS

diff --git a/libcmis/prj/build.lst b/libcmis/prj/build.lst
index 68de49e..6743f89 100644
--- a/libcmis/prj/build.lst
+++ b/libcmis/prj/build.lst
@@ -1,3 +1,3 @@
 lc     libcmis      :       BOOST:boost CURL:curl LIBXML2:libxml2 soltools NULL
 lc     libcmis              usr1    -       all lc_mkout NULL
-lc     libcmis              nmake   -       all lc_libcmis NULL
+lc     libcmis         nmake   -       all lc_libcmis NULL
diff --git a/libcmis/prj/makefile.mk b/libcmis/prj/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/libcmis/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index e5e009f..e529c9c 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1828,7 +1828,25 @@ sub run_job {
 
     if ( $source_config->is_gbuild($jobs_hash{$registered_name}->{MODULE}) )
     {
-        mkpath("$workdir/Logs");
+        if ( $job eq 'deliver' )
+        {
+            return 0;
+        }
+        else
+        {
+            return 1 if (! $path =~ /prj$/ );
+            mkpath("$workdir/Logs");
+            my $gbuild_flags = '-j' . $ENV{GMAKE_MODULE_PARALLELISM};
+            my $gbuild_target = 'all slowcheck';
+            if ($registered_name =~ /tail_build\/prj$/ )
+            {
+                $gbuild_flags = '-j' . $ENV{GMAKE_PARALLELISM};
+                #gbuild_target = $ENV{gb_TAILBUILDTARGET};
+            }
+            $gbuild_flags .= ' ' . $ENV{GMAKE_OPTIONS};
+            $job_to_do = "make -f ../Makefile $gbuild_flags $gbuild_target";
+            print "gbuild module $registered_name: $job_to_do\n";
+        }
     }
     else
     {
@@ -1837,7 +1855,6 @@ sub run_job {
             system("$perl $mkout");
         };
     }
-
     open (MAKE, "$job_to_do 2>&1 |") or return 8;
     open (LOGFILE, "> $log_file") or return 8;
     while (<MAKE>) { print LOGFILE $_; print $_ }
diff --git a/solenv/gbuild/templates/makefile.mk b/solenv/gbuild/templates/makefile.mk
deleted file mode 100644
index 0997622..0000000
--- a/solenv/gbuild/templates/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
commit 6a0972ced879259e7f960e7bb852b0e175a05b7a
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sun Apr 29 01:51:13 2012 +0200

    dont mix gbuild and dmake in one module

diff --git a/cppuhelper/prj/build.lst b/cppuhelper/prj/build.lst
index 96c20b6..f39e1a4 100644
--- a/cppuhelper/prj/build.lst
+++ b/cppuhelper/prj/build.lst
@@ -1,3 +1,2 @@
 ch	cppuhelper	:	BOOST:boost LIBXSLT:libxslt DESKTOP:codemaker cppu offapi registry salhelper xmlreader NULL
 ch	cppuhelper\prj							nmake	-	all	ch_prj NULL
-ch  cppuhelper\qa\propertysetmixin nmake - all ch_qa_propertysetmixin ch_prj NULL
