From caa00f1f150b1dc142a0a2db6cf03aa09c013dca Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <b_michaelsen@openoffice.org>
Date: Sat, 26 Jun 2010 01:29:37 +0200
Subject: CWS gnumake2: module reorg

---
 GNUmakefile | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

(limited to 'GNUmakefile')

diff --git a/GNUmakefile b/GNUmakefile
index 819196040c63..52a4bcc8f240 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -14,12 +14,12 @@
 #
 # 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
+# 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
+# version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
@@ -32,24 +32,6 @@ endif
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(GBUILDDIR)/gbuild.mk
 
-
-include $(foreach module,\
-	framework \
-	sfx2 \
-	svl \
-	svtools \
-	xmloff \
-	sw \
-	toolkit \
-	tools \
-,$(SRCDIR)/$(module)/prj/target_module_$(module).mk)
-
-all : $(foreach module,$(gb_Module_ALLMODULES),$(call gb_Module_get_target,$(module)))
-	$(call gb_Helper_announce,Completed all modules.)
-
-clean : $(foreach module,$(gb_Module_ALLMODULES),$(call gb_Module_get_clean_target,$(module)))
-	$(call gb_Helper_announce,all modules cleaned.)
-
-.DEFAULT_GOAL := all
+$(eval $(call gb_Module_make_global_targets,ooo))
 
 # vim: set noet sw=4 ts=4:
-- 
cgit