From e1a859202ab9b9bb1ca95ba242d72026d2e6312f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 23 Aug 2016 19:22:54 +0200 Subject: [PATCH] buildsystem: don't use recursive make for scripts Second step at removing recursive make: scripts. The *real* easy part. Signed-off-by: "Yann E. MORIN" --- Makefile.am | 9 ++++++++- configure.ac | 1 - scripts/Makefile.am | 1 - 3 files changed, 8 insertions(+), 3 deletions(-) delete mode 100644 scripts/Makefile.am diff --git a/Makefile.am b/Makefile.am index 6741d70..8b0f57a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I scripts/.autostuff/m4 MAKEFLAGS = $(SILENT_MAKEFLAGS) -SUBDIRS = docs libs frontends scripts +SUBDIRS = docs libs frontends EXTRA_DIST = .version #=============================================================================== @@ -38,3 +38,10 @@ utils/kconfig-tweak: utils/kconfig-tweak.in @chmod +x $@ endif # COND_utils + +#=============================================================================== +# Misc. scripts +EXTRA_DIST += \ + scripts/ksync.sh \ + scripts/ksync.list \ + scripts/version.sh diff --git a/configure.ac b/configure.ac index 13cfbdb..43fa06f 100644 --- a/configure.ac +++ b/configure.ac @@ -511,7 +511,6 @@ AC_CONFIG_FILES([ frontends/nconf/Makefile frontends/gconf/Makefile frontends/qconf/Makefile - scripts/Makefile ]) AC_OUTPUT diff --git a/scripts/Makefile.am b/scripts/Makefile.am deleted file mode 100644 index 2df640c..0000000 --- a/scripts/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = ksync.sh ksync.list version.sh -- 2.39.5