Pārlūkot izejas kodu

tools/flex: override SUBDIRS variable with Makefile

Instead of editing the SUBDIRS variable with a patch,
it can be overriden at the end of the command line when invoking Make.

Skip the build for po files as well, which is causing a conflict
depending on the version of gettext detected, and macros present.

Signed-off-by: Michael Pratt <[email protected]>
Michael Pratt 2 gadi atpakaļ
vecāks
revīzija
e764a909e3
2 mainītis faili ar 6 papildinājumiem un 15 dzēšanām
  1. 6 2
      tools/flex/Makefile
  2. 0 13
      tools/flex/patches/100-disable-tests-docs.patch

+ 6 - 2
tools/flex/Makefile

@@ -21,13 +21,17 @@ include $(INCLUDE_DIR)/host-build.mk
 
 HOST_CONFIGURE_ARGS += --disable-shared
 
+define Host/Compile
+	$(call Host/Compile/Default,SUBDIRS='src tools')
+endef
+
 define Host/Install
-	$(call Host/Install/Default)
+	$(call Host/Compile/Default,install SUBDIRS='src tools')
 	$(LN) flex $(STAGING_DIR_HOST)/bin/lex
 endef
 
 define Host/Uninstall
-	-$(call Host/Compile/Default,uninstall)
+	-$(call Host/Compile/Default,uninstall SUBDIRS='src tools')
 endef
 
 define Host/Clean

+ 0 - 13
tools/flex/patches/100-disable-tests-docs.patch

@@ -1,13 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -43,10 +43,7 @@ EXTRA_DIST = \
- 
- SUBDIRS = \
- 	src \
--	doc \
--	examples \
- 	po \
--	tests \
- 	tools
- 
- # Create the ChangeLog, but only if we're inside a git working directory