summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2012-04-28 13:04:45 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2012-04-29 03:50:46 +0200
commitb1c3e8ae28fcd84c7182f4898c3250e18ed92f1a (patch)
tree5c0460d2c5016572dd11b8510e7d56b89f97bd2c
parent6963de9536cfca1145685a611a6c88c5160d9a1c (diff)
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
-rw-r--r--Makefile3
-rw-r--r--MathMLDTD/prj/makefile.mk1
-rw-r--r--Mesa/prj/makefile.mk1
-rw-r--r--UnoControls/prj/makefile.mk1
-rw-r--r--accessibility/prj/makefile.mk1
-rw-r--r--afms/prj/dmake0
-rw-r--r--animations/prj/makefile.mk1
-rw-r--r--apache-commons/prj/dmake0
-rw-r--r--apple_remote/prj/makefile.mk1
-rw-r--r--autodoc/prj/dmake0
-rw-r--r--avmedia/prj/makefile.mk1
-rw-r--r--basctl/prj/makefile.mk1
-rw-r--r--basebmp/prj/makefile.mk1
-rw-r--r--basegfx/prj/makefile.mk1
-rw-r--r--basic/prj/makefile.mk1
-rw-r--r--bean/prj/makefile.mk1
-rw-r--r--beanshell/prj/dmake0
-rw-r--r--berkeleydb/prj/dmake0
-rw-r--r--binaryurp/prj/makefile.mk1
-rw-r--r--boost/prj/dmake0
-rw-r--r--bridges/prj/dmake0
-rw-r--r--cairo/prj/dmake0
-rw-r--r--canvas/prj/makefile.mk1
-rw-r--r--chart2/prj/makefile.mk1
-rw-r--r--cli_ure/prj/dmake0
-rw-r--r--clucene/prj/makefile.mk1
-rw-r--r--codemaker/prj/makefile.mk1
-rw-r--r--comphelper/prj/makefile.mk1
-rw-r--r--configmgr/prj/makefile.mk1
-rw-r--r--connectivity/prj/dmake0
-rw-r--r--cosv/prj/dmake0
-rw-r--r--cppcanvas/prj/makefile.mk1
-rw-r--r--cppu/prj/makefile.mk1
-rw-r--r--cppuhelper/prj/makefile.mk1
-rw-r--r--cppunit/prj/dmake0
-rw-r--r--cpputools/prj/makefile.mk1
-rw-r--r--crashrep/prj/dmake0
-rw-r--r--cross_toolset/prj/dmake0
-rw-r--r--ct2n/prj/dmake0
-rw-r--r--cui/prj/makefile.mk1
-rw-r--r--curl/prj/dmake0
-rw-r--r--dbaccess/prj/makefile.mk1
-rw-r--r--desktop/prj/makefile.mk1
-rw-r--r--drawinglayer/prj/makefile.mk1
-rw-r--r--dtrans/prj/makefile.mk1
-rw-r--r--editeng/prj/makefile.mk1
-rw-r--r--embeddedobj/prj/makefile.mk1
-rw-r--r--embedserv/prj/makefile.mk1
-rw-r--r--epm/prj/dmake0
-rw-r--r--eventattacher/prj/makefile.mk1
-rw-r--r--expat/prj/dmake0
-rw-r--r--extensions/prj/makefile.mk1
-rw-r--r--external/prj/dmake0
-rw-r--r--extras/prj/dmake0
-rw-r--r--fileaccess/prj/makefile.mk1
-rw-r--r--filter/prj/makefile.mk1
-rw-r--r--fontconfig/prj/dmake0
-rw-r--r--forms/prj/makefile.mk1
-rw-r--r--formula/prj/makefile.mk1
-rw-r--r--fpicker/prj/makefile.mk1
-rw-r--r--framework/prj/makefile.mk1
-rw-r--r--freetype/prj/dmake0
-rw-r--r--gdk-pixbuf/prj/dmake0
-rw-r--r--gettext/prj/dmake0
-rw-r--r--glib/prj/dmake0
-rw-r--r--graphite/prj/dmake0
-rw-r--r--hsqldb/prj/dmake0
-rw-r--r--hunspell/prj/dmake0
-rw-r--r--hwpfilter/prj/makefile.mk1
-rw-r--r--hyphen/prj/dmake0
-rw-r--r--i18npool/prj/makefile.mk1
-rw-r--r--i18nutil/prj/makefile.mk1
-rw-r--r--icc/prj/dmake0
-rw-r--r--icu/prj/dmake0
-rw-r--r--idl/prj/makefile.mk1
-rw-r--r--idl/source/prj/makefile.mk1
-rw-r--r--idlc/prj/makefile.mk1
-rw-r--r--instsetoo_native/prj/dmake0
-rw-r--r--io/prj/makefile.mk1
-rw-r--r--javaunohelper/prj/makefile.mk1
-rw-r--r--jfreereport/prj/dmake0
-rw-r--r--jpeg/prj/dmake0
-rw-r--r--jurt/prj/makefile.mk1
-rw-r--r--jvmaccess/prj/makefile.mk1
-rw-r--r--jvmfwk/prj/makefile.mk1
-rw-r--r--l10ntools/prj/dmake0
-rw-r--r--languagetool/prj/dmake0
-rw-r--r--lcms2/prj/dmake0
-rw-r--r--libcdr/prj/dmake0
-rw-r--r--libcmis/prj/dmake0
-rw-r--r--libcroco/prj/dmake0
-rw-r--r--libexttextcat/prj/dmake0
-rw-r--r--libgsf/prj/dmake0
-rw-r--r--libpng/prj/dmake0
-rw-r--r--librsvg/prj/dmake0
-rw-r--r--libvisio/prj/dmake0
-rw-r--r--libwpd/prj/dmake0
-rw-r--r--libwpg/prj/dmake0
-rw-r--r--libwps/prj/dmake0
-rw-r--r--libxml2/prj/dmake0
-rw-r--r--libxmlsec/prj/dmake0
-rw-r--r--libxslt/prj/dmake0
-rw-r--r--lingucomponent/prj/makefile.mk1
-rw-r--r--linguistic/prj/makefile.mk1
-rw-r--r--lotuswordpro/prj/makefile.mk1
-rw-r--r--lpsolve/prj/dmake0
-rw-r--r--lucene/prj/dmake0
-rw-r--r--mdds/prj/dmake0
-rw-r--r--migrationanalysis/prj/dmake0
-rw-r--r--more_fonts/prj/dmake0
-rw-r--r--moz/prj/dmake0
-rw-r--r--mysqlc/prj/dmake0
-rw-r--r--mysqlcppconn/prj/dmake0
-rw-r--r--mythes/prj/dmake0
-rw-r--r--neon/prj/dmake0
-rw-r--r--nlpsolver/prj/makefile.mk1
-rw-r--r--np_sdk/prj/makefile.mk1
-rw-r--r--nss/prj/dmake0
-rw-r--r--o3tl/prj/makefile.mk1
-rw-r--r--odk/prj/dmake0
-rw-r--r--offapi/prj/makefile.mk1
-rw-r--r--officecfg/prj/makefile.mk1
-rw-r--r--oovbaapi/prj/makefile.mk1
-rw-r--r--oox/prj/makefile.mk1
-rw-r--r--openssl/prj/dmake0
-rw-r--r--package/prj/makefile.mk1
-rw-r--r--packimages/prj/build.lst1
-rw-r--r--packimages/prj/makefile.mk1
-rw-r--r--padmin/prj/makefile.mk1
-rw-r--r--pango/prj/dmake0
-rw-r--r--postgresql/prj/dmake0
-rw-r--r--postprocess/prj/dmake0
-rw-r--r--psprint_config/prj/makefile.mk1
-rw-r--r--python/prj/dmake0
-rw-r--r--pyuno/prj/dmake0
-rw-r--r--qadevOOo/prj/makefile.mk1
-rw-r--r--rdbmaker/prj/makefile.mk1
-rw-r--r--readlicense_oo/prj/dmake0
-rw-r--r--redland/prj/dmake0
-rw-r--r--regexp/prj/makefile.mk1
-rw-r--r--registry/prj/dmake0
-rw-r--r--remotebridges/prj/dmake0
-rw-r--r--reportbuilder/prj/dmake0
-rw-r--r--reportdesign/prj/makefile.mk1
-rw-r--r--rhino/prj/dmake0
-rw-r--r--ridljar/prj/makefile.mk1
-rw-r--r--rsc/prj/makefile.mk1
-rw-r--r--rsc/source/prj/dmake0
-rw-r--r--sal/prj/makefile.mk1
-rw-r--r--salhelper/prj/makefile.mk1
-rw-r--r--sane/prj/makefile.mk1
-rw-r--r--sax/prj/makefile.mk1
-rw-r--r--saxon/prj/dmake0
-rw-r--r--sc/prj/makefile.mk1
-rw-r--r--scaddins/prj/makefile.mk1
-rw-r--r--sccomp/prj/makefile.mk1
-rw-r--r--scp2/prj/dmake0
-rw-r--r--scripting/prj/makefile.mk1
-rw-r--r--sd/prj/makefile.mk1
-rw-r--r--sdext/prj/makefile.mk1
-rw-r--r--setup_native/prj/dmake0
-rw-r--r--sfx2/prj/makefile.mk1
-rw-r--r--shell/prj/dmake0
-rw-r--r--slideshow/prj/makefile.mk1
-rw-r--r--smoketest/prj/makefile.mk1
-rw-r--r--solenv/bin/modules/SourceConfig.pm2
-rw-r--r--solenv/inc/gbuildbridge.mk45
-rw-r--r--solenv/prj/dmake0
-rw-r--r--soltools/prj/dmake0
-rw-r--r--sot/prj/makefile.mk1
-rw-r--r--starmath/prj/makefile.mk1
-rw-r--r--stax/prj/dmake0
-rw-r--r--stlport/prj/dmake0
-rwxr-xr-xstoc/prj/makefile.mk1
-rw-r--r--store/prj/dmake0
-rw-r--r--svl/prj/makefile.mk1
-rw-r--r--svtools/prj/makefile.mk1
-rw-r--r--svx/prj/makefile.mk1
-rw-r--r--sw/prj/makefile.mk1
-rw-r--r--swext/prj/makefile.mk1
-rw-r--r--sysui/prj/dmake0
-rw-r--r--tail_build/prj/makefile.mk5
-rw-r--r--test/prj/makefile.mk1
-rw-r--r--testtools/prj/dmake0
-rw-r--r--tomcat/prj/dmake0
-rw-r--r--toolkit/prj/makefile.mk1
-rw-r--r--tools/prj/makefile.mk1
-rw-r--r--twain/prj/makefile.mk1
-rw-r--r--ucb/prj/makefile.mk1
-rw-r--r--ucbhelper/prj/makefile.mk1
-rw-r--r--udkapi/prj/makefile.mk1
-rw-r--r--udm/prj/dmake0
-rw-r--r--unixODBC/prj/makefile.mk1
-rw-r--r--unodevtools/prj/makefile.mk1
-rw-r--r--unoil/prj/makefile.mk1
-rw-r--r--unotest/prj/makefile.mk1
-rw-r--r--unotools/prj/makefile.mk1
-rw-r--r--unoxml/prj/makefile.mk1
-rw-r--r--ure/prj/makefile.mk1
-rw-r--r--uui/prj/makefile.mk1
-rw-r--r--vbahelper/prj/makefile.mk1
-rw-r--r--vcl/prj/makefile.mk1
-rw-r--r--vigra/prj/dmake0
-rw-r--r--wizards/prj/makefile.mk1
-rw-r--r--writerfilter/prj/makefile.mk1
-rw-r--r--writerperfect/prj/makefile.mk1
-rw-r--r--x11_extensions/prj/dmake0
-rw-r--r--xmerge/prj/makefile.mk1
-rw-r--r--xml2cmp/prj/makefile.mk1
-rw-r--r--xmlhelp/prj/dmake0
-rw-r--r--xmloff/prj/makefile.mk1
-rw-r--r--xmlreader/prj/makefile.mk1
-rw-r--r--xmlscript/prj/makefile.mk1
-rw-r--r--xmlsecurity/prj/makefile.mk1
-rw-r--r--xpdf/prj/dmake0
-rw-r--r--xsltml/prj/dmake0
-rw-r--r--zlib/prj/dmake0
217 files changed, 3 insertions, 170 deletions
diff --git a/Makefile b/Makefile
index d6b06bf6932f..36434eb4e522 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/afms/prj/dmake
diff --git a/animations/prj/makefile.mk b/animations/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/apache-commons/prj/dmake
diff --git a/apple_remote/prj/makefile.mk b/apple_remote/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/autodoc/prj/dmake
diff --git a/avmedia/prj/makefile.mk b/avmedia/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/beanshell/prj/dmake
diff --git a/berkeleydb/prj/dmake b/berkeleydb/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/berkeleydb/prj/dmake
diff --git a/binaryurp/prj/makefile.mk b/binaryurp/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/boost/prj/dmake
diff --git a/bridges/prj/dmake b/bridges/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/bridges/prj/dmake
diff --git a/cairo/prj/dmake b/cairo/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/cairo/prj/dmake
diff --git a/canvas/prj/makefile.mk b/canvas/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/cli_ure/prj/dmake
diff --git a/clucene/prj/makefile.mk b/clucene/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/connectivity/prj/dmake
diff --git a/cosv/prj/dmake b/cosv/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/cosv/prj/dmake
diff --git a/cppcanvas/prj/makefile.mk b/cppcanvas/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/cppunit/prj/dmake
diff --git a/cpputools/prj/makefile.mk b/cpputools/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/crashrep/prj/dmake
diff --git a/cross_toolset/prj/dmake b/cross_toolset/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/cross_toolset/prj/dmake
diff --git a/ct2n/prj/dmake b/ct2n/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/ct2n/prj/dmake
diff --git a/cui/prj/makefile.mk b/cui/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/curl/prj/dmake
diff --git a/dbaccess/prj/makefile.mk b/dbaccess/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/epm/prj/dmake
diff --git a/eventattacher/prj/makefile.mk b/eventattacher/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/expat/prj/dmake
diff --git a/extensions/prj/makefile.mk b/extensions/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/external/prj/dmake
diff --git a/extras/prj/dmake b/extras/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/extras/prj/dmake
diff --git a/fileaccess/prj/makefile.mk b/fileaccess/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/fontconfig/prj/dmake
diff --git a/forms/prj/makefile.mk b/forms/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/freetype/prj/dmake
diff --git a/gdk-pixbuf/prj/dmake b/gdk-pixbuf/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/gdk-pixbuf/prj/dmake
diff --git a/gettext/prj/dmake b/gettext/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/gettext/prj/dmake
diff --git a/glib/prj/dmake b/glib/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/glib/prj/dmake
diff --git a/graphite/prj/dmake b/graphite/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/graphite/prj/dmake
diff --git a/hsqldb/prj/dmake b/hsqldb/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/hsqldb/prj/dmake
diff --git a/hunspell/prj/dmake b/hunspell/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/hunspell/prj/dmake
diff --git a/hwpfilter/prj/makefile.mk b/hwpfilter/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/hyphen/prj/dmake
diff --git a/i18npool/prj/makefile.mk b/i18npool/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/icc/prj/dmake
diff --git a/icu/prj/dmake b/icu/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/icu/prj/dmake
diff --git a/idl/prj/makefile.mk b/idl/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/instsetoo_native/prj/dmake
diff --git a/io/prj/makefile.mk b/io/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/jfreereport/prj/dmake
diff --git a/jpeg/prj/dmake b/jpeg/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/jpeg/prj/dmake
diff --git a/jurt/prj/makefile.mk b/jurt/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/l10ntools/prj/dmake
diff --git a/languagetool/prj/dmake b/languagetool/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/languagetool/prj/dmake
diff --git a/lcms2/prj/dmake b/lcms2/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/lcms2/prj/dmake
diff --git a/libcdr/prj/dmake b/libcdr/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/libcdr/prj/dmake
diff --git a/libcmis/prj/dmake b/libcmis/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/libcmis/prj/dmake
diff --git a/libcroco/prj/dmake b/libcroco/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/libcroco/prj/dmake
diff --git a/libexttextcat/prj/dmake b/libexttextcat/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/libexttextcat/prj/dmake
diff --git a/libgsf/prj/dmake b/libgsf/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/libgsf/prj/dmake
diff --git a/libpng/prj/dmake b/libpng/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/libpng/prj/dmake
diff --git a/librsvg/prj/dmake b/librsvg/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/librsvg/prj/dmake
diff --git a/libvisio/prj/dmake b/libvisio/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/libvisio/prj/dmake
diff --git a/libwpd/prj/dmake b/libwpd/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/libwpd/prj/dmake
diff --git a/libwpg/prj/dmake b/libwpg/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/libwpg/prj/dmake
diff --git a/libwps/prj/dmake b/libwps/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/libwps/prj/dmake
diff --git a/libxml2/prj/dmake b/libxml2/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/libxml2/prj/dmake
diff --git a/libxmlsec/prj/dmake b/libxmlsec/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/libxmlsec/prj/dmake
diff --git a/libxslt/prj/dmake b/libxslt/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/libxslt/prj/dmake
diff --git a/lingucomponent/prj/makefile.mk b/lingucomponent/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/lpsolve/prj/dmake
diff --git a/lucene/prj/dmake b/lucene/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/lucene/prj/dmake
diff --git a/mdds/prj/dmake b/mdds/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/mdds/prj/dmake
diff --git a/migrationanalysis/prj/dmake b/migrationanalysis/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/migrationanalysis/prj/dmake
diff --git a/more_fonts/prj/dmake b/more_fonts/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/more_fonts/prj/dmake
diff --git a/moz/prj/dmake b/moz/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/moz/prj/dmake
diff --git a/mysqlc/prj/dmake b/mysqlc/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/mysqlc/prj/dmake
diff --git a/mysqlcppconn/prj/dmake b/mysqlcppconn/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/mysqlcppconn/prj/dmake
diff --git a/mythes/prj/dmake b/mythes/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/mythes/prj/dmake
diff --git a/neon/prj/dmake b/neon/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/neon/prj/dmake
diff --git a/nlpsolver/prj/makefile.mk b/nlpsolver/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/nss/prj/dmake
diff --git a/o3tl/prj/makefile.mk b/o3tl/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/odk/prj/dmake
diff --git a/offapi/prj/makefile.mk b/offapi/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/openssl/prj/dmake
diff --git a/package/prj/makefile.mk b/package/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 1692481bbd46..9cfc1607e43d 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/pango/prj/dmake
diff --git a/postgresql/prj/dmake b/postgresql/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/postgresql/prj/dmake
diff --git a/postprocess/prj/dmake b/postprocess/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/postprocess/prj/dmake
diff --git a/psprint_config/prj/makefile.mk b/psprint_config/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/python/prj/dmake
diff --git a/pyuno/prj/dmake b/pyuno/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/pyuno/prj/dmake
diff --git a/qadevOOo/prj/makefile.mk b/qadevOOo/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/readlicense_oo/prj/dmake
diff --git a/redland/prj/dmake b/redland/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/redland/prj/dmake
diff --git a/regexp/prj/makefile.mk b/regexp/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/registry/prj/dmake
diff --git a/remotebridges/prj/dmake b/remotebridges/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/remotebridges/prj/dmake
diff --git a/reportbuilder/prj/dmake b/reportbuilder/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/reportbuilder/prj/dmake
diff --git a/reportdesign/prj/makefile.mk b/reportdesign/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/rhino/prj/dmake
diff --git a/ridljar/prj/makefile.mk b/ridljar/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/rsc/source/prj/dmake
diff --git a/sal/prj/makefile.mk b/sal/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/saxon/prj/dmake
diff --git a/sc/prj/makefile.mk b/sc/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/scp2/prj/dmake
diff --git a/scripting/prj/makefile.mk b/scripting/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/setup_native/prj/dmake
diff --git a/sfx2/prj/makefile.mk b/sfx2/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/shell/prj/dmake
diff --git a/slideshow/prj/makefile.mk b/slideshow/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 b96cde9fa9b4..ac63f3935a17 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 88b8dbcab5f5..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/solenv/prj/dmake
diff --git a/soltools/prj/dmake b/soltools/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/soltools/prj/dmake
diff --git a/sot/prj/makefile.mk b/sot/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/stax/prj/dmake
diff --git a/stlport/prj/dmake b/stlport/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/stlport/prj/dmake
diff --git a/stoc/prj/makefile.mk b/stoc/prj/makefile.mk
deleted file mode 100755
index 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/store/prj/dmake
diff --git a/svl/prj/makefile.mk b/svl/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sysui/prj/dmake
diff --git a/tail_build/prj/makefile.mk b/tail_build/prj/makefile.mk
deleted file mode 100644
index bd1791f29564..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/testtools/prj/dmake
diff --git a/tomcat/prj/dmake b/tomcat/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/tomcat/prj/dmake
diff --git a/toolkit/prj/makefile.mk b/toolkit/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/udm/prj/dmake
diff --git a/unixODBC/prj/makefile.mk b/unixODBC/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/vigra/prj/dmake
diff --git a/wizards/prj/makefile.mk b/wizards/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/x11_extensions/prj/dmake
diff --git a/xmerge/prj/makefile.mk b/xmerge/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/xmlhelp/prj/dmake
diff --git a/xmloff/prj/makefile.mk b/xmloff/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 0997622e00f6..000000000000
--- 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 000000000000..e69de29bb2d1
--- /dev/null
+++ b/xpdf/prj/dmake
diff --git a/xsltml/prj/dmake b/xsltml/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/xsltml/prj/dmake
diff --git a/zlib/prj/dmake b/zlib/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/zlib/prj/dmake