summaryrefslogtreecommitdiff
path: root/solenv/gbuild/AutoInstallLibs.mk
diff options
context:
space:
mode:
Diffstat (limited to 'solenv/gbuild/AutoInstallLibs.mk')
-rw-r--r--solenv/gbuild/AutoInstallLibs.mk28
1 files changed, 16 insertions, 12 deletions
diff --git a/solenv/gbuild/AutoInstallLibs.mk b/solenv/gbuild/AutoInstallLibs.mk
index ab520d6c0183..aeb7c944ff8e 100644
--- a/solenv/gbuild/AutoInstallLibs.mk
+++ b/solenv/gbuild/AutoInstallLibs.mk
@@ -12,15 +12,19 @@
$(dir $(call gb_AutoInstallLibs_get_target,%)).dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(call gb_AutoInstallLibs_get_target,%) : $(SRCDIR)/Repository.mk
- $(call gb_Output_announce,$*,$(true),AIL,3)
- echo "/* autogenerated library installs for group $(INSTALLMODULE) */" > $@
- echo "#define $(SCP2ID)_ALL \ " >> $@
- $(foreach lib,$(gb_Library_MODULE_$(INSTALLMODULE)),\
- echo " $(SCP2ID)_$(lib), \ " >> $@;)
+$(call gb_AutoInstallLibs_get_target,%) : $(SRCDIR)/Repository.mk $(GBUILDDIR)/AutoInstallLibs.mk
+ $(call gb_Output_announce,$*,$(true),AIN,3)
+ echo "/* autogenerated installs for group $* */" > $@
+ echo "#define auto_$*_ALL \ " >> $@
+ $(foreach lib,$(gb_Library_MODULE_$*),\
+ echo " auto_$*_lib_$(lib), \ " >> $@;)
+ $(foreach exe,$(gb_Executable_MODULE_$*),\
+ echo " auto_$*_exe_$(exe), \ " >> $@;)
echo "" >> $@
- $(foreach lib,$(gb_Library_MODULE_$(INSTALLMODULE)),\
- echo "$(SCP2TEMPLATE)($(SCP2ID)_$(lib),$(call gb_Library_get_runtime_filename,$(lib)))" >> $@;)
+ $(foreach lib,$(gb_Library_MODULE_$*),\
+ echo "$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call gb_Library_get_runtime_filename,$(lib)))" >> $@;)
+ $(foreach exe,$(gb_Executable_MODULE_$*),\
+ echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(exe),$(exe)$(gb_Executable_EXT))" >> $@;)
$(call gb_AutoInstallLibs_get_clean_target,%) :
@@ -35,16 +39,16 @@ $(call gb_Helper_make_userfriendly_targets,all,AutoInstallLibs)
endef
-define gb_AutoInstallLibs_add_category
+# gb_AutoInstallLibs_add_module module lib_template optional:exe_template
+define gb_AutoInstallLibs_add_module
$(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)
+$(call gb_AutoInstallLibs_get_target,$(1)) : SCP2LIBTEMPLATE := $(2)
+$(call gb_AutoInstallLibs_get_target,$(1)) : SCP2EXETEMPLATE := $(3)
endef