From 2939aa6b6a135939a8d933e4a9ddcfc1e29ee647 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 26 Jun 2010 09:14:09 +0200 Subject: [PATCH] CWS gnumake2: more multi-repo support --- GNUmakefile | 2 ++ solenv/gbuild/libnames.mk => Targetnames.mk | 6 ----- .../{alllangres.mk => AllLangResTarget.mk} | 0 .../gbuild/{executable.mk => Executable.mk} | 0 solenv/gbuild/{helper.mk => Helper.mk} | 0 solenv/gbuild/{library.mk => Library.mk} | 0 .../gbuild/{linktarget.mk => LinkTarget.mk} | 0 solenv/gbuild/{module.mk => Module.mk} | 0 solenv/gbuild/{package.mk => Package.mk} | 0 .../gbuild/{pch.mk => PrecompiledHeaders.mk} | 0 solenv/gbuild/{sdi.mk => SdiTarget.mk} | 0 .../{static_library.mk => StaticLibrary.mk} | 0 .../{target_names.mk => TargetLocations.mk} | 0 solenv/gbuild/gbuild.mk | 26 ++++++++++--------- 14 files changed, 16 insertions(+), 18 deletions(-) rename solenv/gbuild/libnames.mk => Targetnames.mk (96%) rename solenv/gbuild/{alllangres.mk => AllLangResTarget.mk} (100%) rename solenv/gbuild/{executable.mk => Executable.mk} (100%) rename solenv/gbuild/{helper.mk => Helper.mk} (100%) rename solenv/gbuild/{library.mk => Library.mk} (100%) rename solenv/gbuild/{linktarget.mk => LinkTarget.mk} (100%) rename solenv/gbuild/{module.mk => Module.mk} (100%) rename solenv/gbuild/{package.mk => Package.mk} (100%) rename solenv/gbuild/{pch.mk => PrecompiledHeaders.mk} (100%) rename solenv/gbuild/{sdi.mk => SdiTarget.mk} (100%) rename solenv/gbuild/{static_library.mk => StaticLibrary.mk} (100%) rename solenv/gbuild/{target_names.mk => TargetLocations.mk} (100%) diff --git a/GNUmakefile b/GNUmakefile index 52a4bcc8f240..99a8df5524fa 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -34,4 +34,6 @@ include $(GBUILDDIR)/gbuild.mk $(eval $(call gb_Module_make_global_targets,ooo)) +include $(foreach repo,$(filter-out $(SRCDIR),$(gb_REPOS)),$(repo)/$(notdir $(firstword $(MAKEFILE_LIST)))) + # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/libnames.mk b/Targetnames.mk similarity index 96% rename from solenv/gbuild/libnames.mk rename to Targetnames.mk index c7524a483f19..2393389efbf5 100644 --- a/solenv/gbuild/libnames.mk +++ b/Targetnames.mk @@ -43,9 +43,6 @@ gb_Executable_NONE := \ bmpsum \ g2g \ - -gb_Library_NAMESCHEMES := OOO PLAIN RT RTVER STL UNO UNOVER - gb_Library_OOOLIBS :=\ avmedia \ basegfx \ @@ -127,9 +124,6 @@ gb_Library_UNOVERLIBS :=\ cppu \ sal \ - -gb_StaticLibrary_NAMESCHEMES := PLAIN - gb_StaticLibrary_PLAINLIBS :=\ salcpprt \ jpeglib \ diff --git a/solenv/gbuild/alllangres.mk b/solenv/gbuild/AllLangResTarget.mk similarity index 100% rename from solenv/gbuild/alllangres.mk rename to solenv/gbuild/AllLangResTarget.mk diff --git a/solenv/gbuild/executable.mk b/solenv/gbuild/Executable.mk similarity index 100% rename from solenv/gbuild/executable.mk rename to solenv/gbuild/Executable.mk diff --git a/solenv/gbuild/helper.mk b/solenv/gbuild/Helper.mk similarity index 100% rename from solenv/gbuild/helper.mk rename to solenv/gbuild/Helper.mk diff --git a/solenv/gbuild/library.mk b/solenv/gbuild/Library.mk similarity index 100% rename from solenv/gbuild/library.mk rename to solenv/gbuild/Library.mk diff --git a/solenv/gbuild/linktarget.mk b/solenv/gbuild/LinkTarget.mk similarity index 100% rename from solenv/gbuild/linktarget.mk rename to solenv/gbuild/LinkTarget.mk diff --git a/solenv/gbuild/module.mk b/solenv/gbuild/Module.mk similarity index 100% rename from solenv/gbuild/module.mk rename to solenv/gbuild/Module.mk diff --git a/solenv/gbuild/package.mk b/solenv/gbuild/Package.mk similarity index 100% rename from solenv/gbuild/package.mk rename to solenv/gbuild/Package.mk diff --git a/solenv/gbuild/pch.mk b/solenv/gbuild/PrecompiledHeaders.mk similarity index 100% rename from solenv/gbuild/pch.mk rename to solenv/gbuild/PrecompiledHeaders.mk diff --git a/solenv/gbuild/sdi.mk b/solenv/gbuild/SdiTarget.mk similarity index 100% rename from solenv/gbuild/sdi.mk rename to solenv/gbuild/SdiTarget.mk diff --git a/solenv/gbuild/static_library.mk b/solenv/gbuild/StaticLibrary.mk similarity index 100% rename from solenv/gbuild/static_library.mk rename to solenv/gbuild/StaticLibrary.mk diff --git a/solenv/gbuild/target_names.mk b/solenv/gbuild/TargetLocations.mk similarity index 100% rename from solenv/gbuild/target_names.mk rename to solenv/gbuild/TargetLocations.mk diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 71bd05a2e0aa..46e0d8399fff 100755 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -111,8 +111,10 @@ ifeq ($(MAKECMDGOALS),clean) gb_FULLDEPS := $(false) endif -include $(GBUILDDIR)/helper.mk -include $(GBUILDDIR)/libnames.mk +include $(GBUILDDIR)/Helper.mk +gb_Library_NAMESCHEMES := OOO PLAIN RT RTVER STL UNO UNOVER +gb_StaticLibrary_NAMESCHEMES := PLAIN +include $(foreach repo,$(gb_REPOS),$(repo)/Targetnames.mk) gb_Library_TARGETS := $(foreach namescheme,$(gb_Library_NAMESCHEMES),$(gb_Library_$(namescheme)LIBS)) gb_StaticLibrary_TARGETS := $(foreach namescheme,$(gb_StaticLibrary_NAMESCHEMES),$(gb_StaticLibrary_$(namescheme)LIBS)) @@ -192,7 +194,7 @@ endif gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) -include $(GBUILDDIR)/target_names.mk +include $(GBUILDDIR)/TargetLocations.mk # static members declared here because they are used globally @@ -203,15 +205,15 @@ gb_StaticLibrary_OUTDIRLOCATION := $(OUTDIR)/lib # We are using a set of scopes that we might as well call classes. include $(foreach class,\ - linktarget\ - library\ - static_library\ - executable\ - sdi\ - alllangres\ - package\ - pch\ - module\ + LinkTarget\ + Library\ + StaticLibrary\ + Executable\ + SdiTarget\ + AllLangResTarget\ + Package\ + PrecompiledHeaders\ + Module\ ,$(GBUILDDIR)/$(class).mk) # vim: set noet sw=4 ts=4: