diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-11-12 02:06:53 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-11-12 02:06:53 +0100 |
| commit | 7e56abfcd635b954b9ee14a3572253357c4afb88 (patch) | |
| tree | 5530c9cf97ccd92ccb5a256d42f8022d8753bf99 /solenv/gbuild/Module.mk | |
| parent | 6821b9b70eacb75ca9092d3b8d1449353275ff22 (diff) | |
| parent | 0127304341e3050d97c2dde42c6582b6f626acf2 (diff) | |
gnumake2: merging minibranches
Diffstat (limited to 'solenv/gbuild/Module.mk')
| -rwxr-xr-x | solenv/gbuild/Module.mk | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index 767c4aec83d5..1c7a8c885ceb 100755 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -32,12 +32,6 @@ gb_Module_ALLMODULES := gb_Module_MODULELOCATIONS := gb_Module_TARGETSTACK := gb_Module_CLEANTARGETSTACK := -ifeq ($(gb_PARTITIALBUILD),$(true)) -gb_Module_PATHTOREPOROOT := /../ -else -gb_Module_PATHTOREPOROOT := -endif - .PHONY : $(call gb_Module_get_clean_target,%) $(call gb_Module_get_clean_target,%) : @@ -51,6 +45,9 @@ $(call gb_Module_get_target,%) : mkdir -p $(dir $@) && \ touch $@) +.PHONY : all clean install uninstall +.DEFAULT_GOAL := all + all : $(call gb_Helper_announce,top level modules: $(foreach module,$^,$(notdir $(module))),$(true),ALL,6) $(call gb_Helper_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),ALL,6) @@ -59,8 +56,9 @@ clean : $(call gb_Helper_announce,top level modules: $(foreach module,$^,$(notdir $(module))),$(false),ALL,6) $(call gb_Helper_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(false),ALL,6) -.PHONY : all clean install uninstall -.DEFAULT_GOAL := all +install : all +uninstall : clean + define gb_Module_Module gb_Module_ALLMODULES += $(1) @@ -96,13 +94,10 @@ ifneq ($$(gb_Module_TARGETSTACK),) $$(warn corrupted module target stack!) endif -include $(dir $(1))$(gb_Module_PATHTOREPOROOT)/SourcePath.mk include $(1) all : $$(firstword $$(gb_Module_TARGETSTACK)) clean : $$(firstword $$(gb_Module_CLEANTARGETSTACK)) -install : all -uninstall : clean ifneq ($$(words $$(gb_Module_TARGETSTACK)),1) $$(warn corrupted module target stack!) |