antimake: Fix DoEmbed to use two target lists properly
authorMarko Kreen <markokr@gmail.com>
Sat, 7 Jul 2012 16:54:01 +0000 (19:54 +0300)
committerMarko Kreen <markokr@gmail.com>
Sat, 7 Jul 2012 17:06:56 +0000 (20:06 +0300)
The EXTRA list was added wrongly and with extra ','
which hided the problem.

mk/antimake.mk

index 3caca449d6307b8683ae4effc842061d376b7e81..7e80e31c9e5a8c4c00f2d23b4d3c8471ba796887 100755 (executable)
@@ -863,8 +863,7 @@ endef
 DoEmbed = $(trace1)$(strip \
        $(if $(wildcard $(am_srcdir)/$(1)/Makefile.am), \
                $(eval include $(am_srcdir)/$(1)/Makefile.am $(NewLine)) \
-              $(eval $(call EmbedProcess,$(1),$(call CleanName,$(1)),$(AM_NONEXTRA_TLISTS))), \
-              $(eval $(call EmbedProcess,$(1),$(call CleanName,$(1)),$(AM_EXTRA_TLISTS))), \
+              $(eval $(call EmbedProcess,$(1),$(call CleanName,$(1)),$(AM_NONEXTRA_TLISTS) $(AM_EXTRA_TLISTS))), \
             $(error $(SUBLOC)/Makefile failure: $(call JoinPath,$(SUBLOC),$(1)/Makefile.am) not found.)))
 
 ##