From 41f1176c69b4a7657c255e21d94c105684e58a09 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Wed, 15 Dec 2010 22:30:31 -0600
Subject: rename GNUmakefile sot that make continue to invoke build by default

use make -f GNUmakefile.mk to invoke the top-level gnumake build
---
 GNUmakefile.mk | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 GNUmakefile.mk

(limited to 'GNUmakefile.mk')

diff --git a/GNUmakefile.mk b/GNUmakefile.mk
new file mode 100644
index 000000000000..d8bdd13db0f0
--- /dev/null
+++ b/GNUmakefile.mk
@@ -0,0 +1,36 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(dir $(lastword $(MAKEFILE_LIST)))/SourcePath.mk
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(SRCDIR)/Module_ooo.mk))
+
+include $(foreach repo,$(filter-out $(SRCDIR),$(gb_REPOS)),$(repo)/$(notdir $(firstword $(MAKEFILE_LIST))))
+
+# vim: set noet sw=4 ts=4:
-- 
cgit 


From e02b1873814db306dd5075e3eb161e3a2b6faa4d Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Mon, 20 Dec 2010 04:39:36 -0600
Subject: first try at local build dirs

---
 GNUmakefile.mk | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'GNUmakefile.mk')

diff --git a/GNUmakefile.mk b/GNUmakefile.mk
index d8bdd13db0f0..fd53e09e2dda 100644
--- a/GNUmakefile.mk
+++ b/GNUmakefile.mk
@@ -25,6 +25,10 @@
 #
 #*************************************************************************
 
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(dir $(lastword $(MAKEFILE_LIST)))/SourcePath.mk
 include $(GBUILDDIR)/gbuild.mk
-- 
cgit 


From 185f7225ea558079dfa810ca8a6bc26d3761f9a9 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Mon, 20 Dec 2010 04:57:53 -0600
Subject: removed hardcoded module name ooo in root makefile

---
 GNUmakefile.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'GNUmakefile.mk')

diff --git a/GNUmakefile.mk b/GNUmakefile.mk
index fd53e09e2dda..51b2f03b2bb1 100644
--- a/GNUmakefile.mk
+++ b/GNUmakefile.mk
@@ -33,7 +33,8 @@ GBUILDDIR := $(SOLARENV)/gbuild
 include $(dir $(lastword $(MAKEFILE_LIST)))/SourcePath.mk
 include $(GBUILDDIR)/gbuild.mk
 
-$(eval $(call gb_Module_make_global_targets,$(SRCDIR)/Module_ooo.mk))
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(SRCDIR)/Module_*.mk)))
+
 
 include $(foreach repo,$(filter-out $(SRCDIR),$(gb_REPOS)),$(repo)/$(notdir $(firstword $(MAKEFILE_LIST))))
 
-- 
cgit 


From fa9f2897aea645d625b466317a346df8ec4dda41 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Mon, 20 Dec 2010 05:05:21 -0600
Subject: making multirepo build more generic

---
 GNUmakefile.mk | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'GNUmakefile.mk')

diff --git a/GNUmakefile.mk b/GNUmakefile.mk
index 51b2f03b2bb1..95fe9e558fe2 100644
--- a/GNUmakefile.mk
+++ b/GNUmakefile.mk
@@ -30,12 +30,8 @@ $(error No environment set!)
 endif
 
 GBUILDDIR := $(SOLARENV)/gbuild
-include $(dir $(lastword $(MAKEFILE_LIST)))/SourcePath.mk
 include $(GBUILDDIR)/gbuild.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(SRCDIR)/Module_*.mk)))
-
-
-include $(foreach repo,$(filter-out $(SRCDIR),$(gb_REPOS)),$(repo)/$(notdir $(firstword $(MAKEFILE_LIST))))
+$(foreach repo,$(gb_REPOS),$(eval $(call gb_Module_make_global_targets,$(shell ls $(repo)/Module_*.mk))))
 
 # vim: set noet sw=4 ts=4:
-- 
cgit 


From aa486f30751aae55a46476db50c9bbe630738e63 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Mon, 20 Dec 2010 09:33:22 -0600
Subject: using wildcard instead of shell call in global makefile

---
 GNUmakefile.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'GNUmakefile.mk')

diff --git a/GNUmakefile.mk b/GNUmakefile.mk
index 95fe9e558fe2..ccf548bda34a 100644
--- a/GNUmakefile.mk
+++ b/GNUmakefile.mk
@@ -32,6 +32,6 @@ endif
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(GBUILDDIR)/gbuild.mk
 
-$(foreach repo,$(gb_REPOS),$(eval $(call gb_Module_make_global_targets,$(shell ls $(repo)/Module_*.mk))))
+$(foreach repo,$(gb_REPOS),$(eval $(call gb_Module_make_global_targets,$(wildcard $(repo)/Module_*.mk))))
 
 # vim: set noet sw=4 ts=4:
-- 
cgit