hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

autotools.mk: introduce PKG_MACRO_PATHS and HOST_MACRO_PATHS which default to ./m4, add LIBTOOL to AM_TOOL_PATHS 

SVN-Revision: 24830
owl
Jo-Philipp Wich 2010-12-26 02:06:50 +00:00
parent f5b3f741ce
commit ec45087403
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/autotools.mk
View File

@ -21,6 +21,7 @@ AM_TOOL_PATHS:= \
ACLOCAL=$(STAGING_DIR_HOST)/bin/aclocal \ ACLOCAL=$(STAGING_DIR_HOST)/bin/aclocal \
AUTOHEADER=$(STAGING_DIR_HOST)/bin/autoheader \ AUTOHEADER=$(STAGING_DIR_HOST)/bin/autoheader \
LIBTOOLIZE=$(STAGING_DIR_HOST)/bin/libtoolize \ LIBTOOLIZE=$(STAGING_DIR_HOST)/bin/libtoolize \
LIBTOOL=$(STAGING_DIR_HOST)/bin/libtool \
M4=$(STAGING_DIR_HOST)/bin/m4 \ M4=$(STAGING_DIR_HOST)/bin/m4 \
AUTOPOINT=true AUTOPOINT=true
@ -34,13 +35,12 @@ define autoreconf
$(patsubst %,rm -f %;,$(2)) \ $(patsubst %,rm -f %;,$(2)) \
$(foreach p,$(3), \ $(foreach p,$(3), \
if [ -f $(p)/configure.ac ] || [ -f $(p)/configure.in ]; then \ if [ -f $(p)/configure.ac ] || [ -f $(p)/configure.in ]; then \
[ -f $(p)/aclocal.m4 ] && [ ! -f $(p)/acinclude.m4 ] && mv aclocal.m4 acinclude.m4; \
[ -d $(p)/autom4te.cache ] && rm -rf autom4te.cache; \ [ -d $(p)/autom4te.cache ] && rm -rf autom4te.cache; \
touch NEWS AUTHORS COPYING ChangeLog; \ touch NEWS AUTHORS COPYING ChangeLog; \
$(AM_TOOL_PATHS) $(STAGING_DIR_HOST)/bin/autoreconf -v -f -i -s \ $(AM_TOOL_PATHS) $(STAGING_DIR_HOST)/bin/autoreconf -v -f -i -s \
-B $(STAGING_DIR_HOST)/share/aclocal \ -B $(STAGING_DIR_HOST)/share/aclocal \
$(patsubst %,-B %,$(5)) \ $(patsubst %,-B %,$(5)) \
$(patsubst %,-I %,$(4)) -I m4 $(4) || true; \ $(patsubst %,-I %,$(4)) $(4) || true; \
fi; \ fi; \
) \ ) \
); );
@ -49,6 +49,7 @@ endef
PKG_LIBTOOL_PATHS?=$(CONFIGURE_PATH) PKG_LIBTOOL_PATHS?=$(CONFIGURE_PATH)
PKG_AUTOMAKE_PATHS?=$(CONFIGURE_PATH) PKG_AUTOMAKE_PATHS?=$(CONFIGURE_PATH)
PKG_MACRO_PATHS?=m4
PKG_REMOVE_FILES?=aclocal.m4 PKG_REMOVE_FILES?=aclocal.m4
Hooks/InstallDev/Post += libtool_remove_files Hooks/InstallDev/Post += libtool_remove_files
@ -57,7 +58,7 @@ define autoreconf_target
$(strip $(call autoreconf, \ $(strip $(call autoreconf, \
$(PKG_BUILD_DIR), $(PKG_REMOVE_FILES), \ $(PKG_BUILD_DIR), $(PKG_REMOVE_FILES), \
$(PKG_AUTOMAKE_PATHS), $(PKG_LIBTOOL_PATHS), \ $(PKG_AUTOMAKE_PATHS), $(PKG_LIBTOOL_PATHS), \
$(STAGING_DIR)/host/share/aclocal $(STAGING_DIR)/usr/share/aclocal)) $(STAGING_DIR)/host/share/aclocal $(STAGING_DIR)/usr/share/aclocal $(PKG_MACRO_PATHS)))
endef endef
ifneq ($(filter libtool,$(PKG_FIXUP)),) ifneq ($(filter libtool,$(PKG_FIXUP)),)
@ -84,12 +85,14 @@ endif
HOST_FIXUP?=$(PKG_FIXUP) HOST_FIXUP?=$(PKG_FIXUP)
HOST_LIBTOOL_PATHS?=$(if $(PKG_LIBTOOL_PATHS),$(PKG_LIBTOOL_PATHS),.) HOST_LIBTOOL_PATHS?=$(if $(PKG_LIBTOOL_PATHS),$(PKG_LIBTOOL_PATHS),.)
HOST_AUTOMAKE_PATHS?=$(if $(PKG_AUTOMAKE_PATHS),$(PKG_AUTOMAKE_PATHS),.) HOST_AUTOMAKE_PATHS?=$(if $(PKG_AUTOMAKE_PATHS),$(PKG_AUTOMAKE_PATHS),.)
HOST_MACRO_PATHS?=$(if $(PKG_MACRO_PATHS),$(PKG_MACRO_PATHS),m4)
HOST_REMOVE_FILES?=$(PKG_REMOVE_FILES) HOST_REMOVE_FILES?=$(PKG_REMOVE_FILES)
define autoreconf_host define autoreconf_host
$(strip $(call autoreconf, \ $(strip $(call autoreconf, \
$(HOST_BUILD_DIR), $(HOST_REMOVE_FILES), \ $(HOST_BUILD_DIR), $(HOST_REMOVE_FILES), \
$(HOST_AUTOMAKE_PATHS), $(HOST_LIBTOOL_PATHS))) $(HOST_AUTOMAKE_PATHS), $(HOST_LIBTOOL_PATHS), \
$(HOST_MACRO_PATHS)))
endef endef
ifneq ($(filter libtool,$(HOST_FIXUP)),) ifneq ($(filter libtool,$(HOST_FIXUP)),)