[beast: 1/17] BUILD: prepare for including Makefile.sub from subdirs



commit c6e9c398568033cf62f6aa98c31da1597de8a45d
Author: Tim Janik <timj gnu org>
Date:   Sun Oct 15 14:00:10 2017 +0200

    BUILD: prepare for including Makefile.sub from subdirs
    
    Signed-off-by: Tim Janik <timj gnu org>

 Makefile.am |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 insertions(+), 9 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 475de25..addbd5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,10 +3,31 @@
 include $(top_srcdir)/Makefile.decl
 topdir = $(abs_top_srcdir)
 
-SUBDIRS                = . sfi bse plugins drivers pybeast beast-gtk launchers library tools ebeast po docs 
data tests
+SUBDIRS                = sfi bse plugins drivers pybeast beast-gtk launchers library tools ebeast po docs 
data tests .
+
+# == make setup ==
+DEFS                    += -DBSE_CONVENIENCE
+QTEST                    = @echo '  TEST    ' $@;
+AM_CPPFLAGS             += -I$(top_srcdir) -I$(top_builddir)
+lib_LTLIBRARIES          =
+bin_PROGRAMS             =
+bin_SCRIPTS              =
+#noinst_DATA             =
+noinst_SCRIPTS           =
+noinst_PROGRAMS          =
+noinst_LTLIBRARIES      =
+
+# == early rules ==
+# Ideally, all directories would provide a Makefile.sub and be included here
+# in the appropriate order. Since we're not there yet, *some* Makefile.sub
+# rules need to be build before recursing into subdirs with Makefile.am, and
+# other Makefile.sub rules need to be build *after* recursing into subdirs.
+# We solve this by building ./ last, and using BUILT_SOURCES to force builds
+# of files required before we recurse into subdirs with Makefile.am.
+BUILT_SOURCES            =
 
 # == res/ ==
-# define res_resfiles_list
+# define res_resfiles_list via immediate assignment
 include res/Makefile.sub
 
 # == doc/ install ==
@@ -29,13 +50,6 @@ MAINTAINERCLEANFILES += HACKING
        $(Q) chmod a-w $@       # prevent accidental target file edits
 MAINTAINERCLEANFILES += README README.html
 
-# check: message
-ALL_CHECKED_MSG = "All package tests passed"
-check: check-recursive
-       @echo $(ALL_CHECKED_MSG) | sed 's/./=/g'
-       @echo $(ALL_CHECKED_MSG)
-       @echo $(ALL_CHECKED_MSG) | sed 's/./=/g'
-
 # == BSE App Test ==
 bse-app-test:
        $(Q) cd . \
@@ -73,6 +87,7 @@ ChangeLog: $(GITSTAMP)
        $(Q) test -s $@ || { mv $@ $@.empty ; ls -al --full-time $@.empty ; exit 1 ; }
 noinst_DATA          += ChangeLog
 MAINTAINERCLEANFILES += ChangeLog
+BUILT_SOURCES        += ChangeLog
 
 # == dist ==
 distname      = $(PACKAGE)-$(VERSION)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]