gnumake3: adjust comphelper to new build env

3 files changed, 42 insertions, 30 deletions

diff --git a/comphelper/prj/build.lst b/comphelper/prj/build.lst
index 91e836cabd68..9a7e89771be3 100644
--- a/comphelper/prj/build.lst
+++ b/comphelper/prj/build.lst
@@ -1,15 +1,2 @@
-ph	comphelper	:	cppuhelper ucbhelper offuh vos salhelper LIBXSLT:libxslt NULL
-ph	comphelper								usr1	-	all	ph_mkout NULL
-ph	comphelper\inc							nmake	-	all	ph_inc NULL
-ph	comphelper\source\container				nmake	-	all	ph_container ph_inc NULL
-ph	comphelper\source\eventattachermgr		nmake	-	all	ph_evtatmgr ph_inc NULL
-ph	comphelper\source\misc					nmake	-	all	ph_misc ph_inc NULL
-ph	comphelper\source\processfactory		nmake	-	all	ph_procfact ph_inc NULL
-ph	comphelper\source\property				nmake	-	all	ph_property ph_inc NULL
-ph	comphelper\source\streaming				nmake	-	all	ph_streaming ph_inc NULL
-ph	comphelper\source\compare				nmake	-	all	ph_compare ph_inc NULL
-ph  comphelper\source\officeinstdir         nmake   -   all ph_officeinstdir ph_inc NULL
-ph  comphelper\source\xml                   nmake   -   all ph_xml NULL
-ph  comphelper\util                         nmake   -   all ph_util ph_container ph_evtatmgr ph_misc ph_procfact ph_property ph_streaming ph_compare ph_officeinstdir ph_xml NULL
-
-ph comphelper\qa\complex\comphelper nmake - all ph_complex ph_util NULL
+ch rcomphelper : cppuhelper ucbhelper offuh vos salhelper LIBXSLT:libxslt NULL
+ch comphelper\prj nmake - all ch_all NULL
diff --git a/comphelper/prj/d.lst b/comphelper/prj/d.lst
index f05fcf0926dd..e69de29bb2d1 100644
--- a/comphelper/prj/d.lst
+++ b/comphelper/prj/d.lst
@@ -1,15 +0,0 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin
-..\%__SRC%\inc\*.bin %_DEST%\bin%_EXT%\*.bin
-
-mkdir: %_DEST%\inc%_EXT%\comphelper
-..\inc\comphelper\*.hxx %_DEST%\inc%_EXT%\comphelper\*.hxx
-..\inc\comphelper\*.h %_DEST%\inc%_EXT%\comphelper\*.h
-mkdir: %_DEST%\inc%_EXT%\cppuhelper
-..\inc\comphelper\extract.hxx %_DEST%\inc%_EXT%\cppuhelper\extract.hxx
-..\version.mk  %_DEST%\inc%_EXT%\comphelper\version.mk
-..\%__SRC%\misc\comphelp4.component %_DEST%\xml%_EXT%\comphelp4.component
diff --git a/comphelper/prj/makefile.mk b/comphelper/prj/makefile.mk
new file mode 100644
index 000000000000..c73a3d944bbf
--- /dev/null
+++ b/comphelper/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# 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 "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)