diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-07 15:05:43 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-07 15:09:53 +0200 |
| commit | 9edb6984a11c2a2c3fc8d859077e7521894dedeb (patch) | |
| tree | 5c2e56c64b814463e9d88963de270cd8241c61e1 /solenv | |
| parent | a47a153a7f75edfe3bce33f0d34b723cbd2d5195 (diff) | |
gbuild: simplify AutoInstallLibs makefiles
Change-Id: I19a0daab185a1ef25f9354f551f8cb0c03064cb1
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/AutoInstallLibs.mk | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/solenv/gbuild/AutoInstallLibs.mk b/solenv/gbuild/AutoInstallLibs.mk index 3555c2331145..ab520d6c0183 100644 --- a/solenv/gbuild/AutoInstallLibs.mk +++ b/solenv/gbuild/AutoInstallLibs.mk @@ -15,7 +15,6 @@ $(dir $(call gb_AutoInstallLibs_get_target,%)).dir : $(call gb_AutoInstallLibs_get_target,%) : $(SRCDIR)/Repository.mk $(call gb_Output_announce,$*,$(true),AIL,3) echo "/* autogenerated library installs for group $(INSTALLMODULE) */" > $@ - $(call gb_Output_info,install module: $(INSTALLMODULE) contents: $(gb_Library_MODULE_$(INSTALLMODULE))) echo "#define $(SCP2ID)_ALL \ " >> $@ $(foreach lib,$(gb_Library_MODULE_$(INSTALLMODULE)),\ echo " $(SCP2ID)_$(lib), \ " >> $@;) @@ -29,15 +28,24 @@ $(call gb_AutoInstallLibs_get_clean_target,%) : rm -f $(call gb_AutoInstallLibs_get_target,$*) define gb_AutoInstallLibs_AutoInstallLibs +$(call gb_AutoInstallLibs_get_target,all) :| $(dir $(call gb_AutoInstallLibs_get_target,all)).dir + +$$(eval $$(call gb_Module_register_target,$(call gb_AutoInstallLibs_get_target,all),$(call gb_AutoInstallLibs_get_clean_target,all))) +$(call gb_Helper_make_userfriendly_targets,all,AutoInstallLibs) + +endef + +define gb_AutoInstallLibs_add_category +$(call gb_AutoInstallLibs_get_target,all) : $(call gb_AutoInstallLibs_get_target,$(1)) +$(call gb_AutoInstallLibs_get_clean_target,all) : $(call gb_AutoInstallLibs_get_clean_target,$(1)) +$(call gb_Helper_make_userfriendly_targets,$(1),AutoInstallLibs) + $(call gb_AutoInstallLibs_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE) $(call gb_AutoInstallLibs_get_target,$(1)) :| $(dir $(call gb_AutoInstallLibs_get_target,$(1))).dir $(call gb_AutoInstallLibs_get_target,$(1)) : INSTALLMODULE = $(2) $(call gb_AutoInstallLibs_get_target,$(1)) : SCP2TEMPLATE = $(3) $(call gb_AutoInstallLibs_get_target,$(1)) : SCP2ID = $(4) -$$(eval $$(call gb_Module_register_target,$(call gb_AutoInstallLibs_get_target,$(1)),$(call gb_AutoInstallLibs_get_clean_target,$(1)))) -$(call gb_Helper_make_userfriendly_targets,$(1),AutoInstallLibs) - endef # vim: set shiftwidth=4 tabstop=4 noexpandtab: |