diff options
Diffstat (limited to 'make/include')
| -rw-r--r-- | make/include/contrib.defs | 3 | ||||
| -rw-r--r-- | make/include/main.defs | 12 |
2 files changed, 13 insertions, 2 deletions
diff --git a/make/include/contrib.defs b/make/include/contrib.defs index 9dfddea6e..963e98226 100644 --- a/make/include/contrib.defs +++ b/make/include/contrib.defs @@ -19,7 +19,8 @@ define import.CONTRIB.defs ## $(1).src/ = $$(SRC/)contrib/$($(1).name)/ $(1).build/ = $$(CONTRIB.build/)$($(1).name)/ - $(1).deps = $$(foreach n,$($(1).prerequisites),$$($$n.INSTALL.target)) + ## add prerequisites and autotool modules for all contribs + $(1).deps = $$(foreach n,$($(1).prerequisites) $(if $(filter $1,$(AUTOTOOL_MODULES)),,$(AUTOTOOL_MODULES)),$$($$n.INSTALL.target)) ## ## target: fetch diff --git a/make/include/main.defs b/make/include/main.defs index df81a0fda..ff6e73f2a 100644 --- a/make/include/main.defs +++ b/make/include/main.defs @@ -8,6 +8,17 @@ include $(SRC/)make/include/tool.defs ############################################################################### +ifeq (1,$(FEATURE.local_autotools)) + MODULES += contrib/autoconf + MODULES += contrib/automake + MODULES += contrib/libtool + MODULES += contrib/m4 + AUTOTOOL_MODULES = AUTOCONF AUTOMAKE LIBTOOL M4 + PATH := $(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH) +else + AUTOTOOL_MODULES = +endif + MODULES += contrib/a52dec ifneq (,$(filter $(BUILD.system),cygwin mingw)) @@ -20,7 +31,6 @@ ifneq (,$(filter $(BUILD.system),darwin cygwin mingw)) MODULES += contrib/fribidi endif - MODULES += contrib/faac MODULES += contrib/ffmpeg MODULES += contrib/fontconfig |