From 5be455a710c57bbbbd49c2d671b42098db7be5dc Mon Sep 17 00:00:00 2001 From: Andreas Fritiofson Date: Sun, 6 Nov 2016 20:19:26 +0100 Subject: Convert to non-recursive make Change-Id: I11f8bc8553957e2ff083c09e72e16881e4d3bb6f Signed-off-by: Andreas Fritiofson Reviewed-on: http://openocd.zylin.com/3865 Tested-by: jenkins Reviewed-by: Paul Fertser --- Makefile.am | 64 ++++++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 18 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 2ddc96d..579d3a7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,15 +12,34 @@ nobase_dist_pkgdata_DATA = \ contrib/libdcc/README \ contrib/99-openocd.rules -if INTERNAL_JIMTCL -SUBDIRS = jimtcl -else SUBDIRS = +DIST_SUBDIRS = +bin_PROGRAMS = +noinst_LTLIBRARIES = +info_TEXINFOS = +dist_man_MANS = +EXTRA_DIST = + +if INTERNAL_JIMTCL +SUBDIRS += jimtcl +DIST_SUBDIRS += jimtcl endif -SUBDIRS += src doc +# common flags used in openocd build +AM_CFLAGS = $(GCC_WARNINGS) + +AM_CPPFLAGS = $(HOST_CPPFLAGS)\ + -I$(top_srcdir)/src \ + -I$(top_builddir)/src \ + -I$(top_srcdir)/src/helper \ + -DPKGDATADIR=\"$(pkgdatadir)\" \ + -DBINDIR=\"$(bindir)\" -EXTRA_DIST = \ +if INTERNAL_JIMTCL +AM_CPPFLAGS += -I$(top_srcdir)/jimtcl \ + -I$(top_builddir)/jimtcl +endif +EXTRA_DIST += \ BUGS \ HACKING \ NEWTAPS \ @@ -96,17 +115,26 @@ distclean-local: DISTCLEANFILES = doxygen.log +METASOURCES = AUTO + +BUILT_SOURCES = +CLEANFILES = + MAINTAINERCLEANFILES = \ - $(srcdir)/INSTALL \ - $(srcdir)/configure \ - $(srcdir)/Makefile.in \ - $(srcdir)/depcomp \ - $(srcdir)/config.guess \ - $(srcdir)/config.sub \ - $(srcdir)/config.h.in \ - $(srcdir)/config.h.in~ \ - $(srcdir)/compile \ - $(srcdir)/ltmain.sh \ - $(srcdir)/missing \ - $(srcdir)/aclocal.m4 \ - $(srcdir)/install-sh + %D%/INSTALL \ + %D%/configure \ + %D%/Makefile.in \ + %D%/depcomp \ + %D%/config.guess \ + %D%/config.sub \ + %D%/config.h.in \ + %D%/config.h.in~ \ + %D%/compile \ + %D%/ltmain.sh \ + %D%/missing \ + %D%/aclocal.m4 \ + %D%/install-sh \ + %D%/texinfo.tex + +include src/Makefile.am +include doc/Makefile.am -- cgit v1.1