diff options
| author | Bradley Sepos <[email protected]> | 2018-06-10 16:31:46 -0400 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2018-06-17 00:23:34 -0400 |
| commit | 517ed0030f340d3b8f3f2aee1cbac23f5e9da30a (patch) | |
| tree | 5e99d507f3cc5bbb3d727d0167e6d14385e80c3b /make/include | |
| parent | 980795ec6461d49cac26afc7e3a36a2917f84f4e (diff) | |
contrib: make: Remove --enable-local-autotools and --enable-local-pkgconfig.
Closes #549.
Diffstat (limited to 'make/include')
| -rw-r--r-- | make/include/contrib.defs | 2 | ||||
| -rw-r--r-- | make/include/main.defs | 18 |
2 files changed, 1 insertions, 19 deletions
diff --git a/make/include/contrib.defs b/make/include/contrib.defs index 3d2aa9074..062135f7b 100644 --- a/make/include/contrib.defs +++ b/make/include/contrib.defs @@ -26,7 +26,7 @@ define import.CONTRIB.defs $(1).src/ = $$(SRC/)contrib/$($(1).dir)/ $(1).build/ = $$(CONTRIB.build/)$($(1).dir)/ ## add prerequisites and autotool modules for all contribs - $(1).deps = $$(foreach n,$($(1).prerequisites) $(if $(filter $1,$(AUTOTOOL_MODULES)),,$(AUTOTOOL_MODULES)),$$($$n.INSTALL.target)) + $(1).deps = $$(foreach n,$($(1).prerequisites),$$($$n.INSTALL.target)) $(1).build_dir = ## diff --git a/make/include/main.defs b/make/include/main.defs index 7db389b52..3ac75c8de 100644 --- a/make/include/main.defs +++ b/make/include/main.defs @@ -7,30 +7,12 @@ include $(SRC/)make/include/tool.defs ############################################################################### -ifeq (1,$(FEATURE.local_pkgconfig)) - MODULES += contrib/pkgconfig -endif - HB_TOOLS_PATH = ifeq (1,$(FEATURE.local_cmake)) MODULES += contrib/cmake HB_TOOLS_PATH = $(call fn.ABSOLUTE,$(CONTRIB.build/)bin) endif -ifeq (1,$(FEATURE.local_autotools)) - MODULES += contrib/autoconf - MODULES += contrib/automake - MODULES += contrib/libtool - MODULES += contrib/m4 -ifneq (1,$(FEATURE.local_pkgconfig)) - MODULES += contrib/pkgconfig -endif - AUTOTOOL_MODULES = AUTOCONF AUTOMAKE LIBTOOL M4 PKGCONFIG - HB_TOOLS_PATH = $(call fn.ABSOLUTE,$(CONTRIB.build/)bin) -else - AUTOTOOL_MODULES = -endif - ifneq (,$(HB_TOOLS_PATH)) PATH := $(HB_TOOLS_PATH):$(PATH) endif |