diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-05-24 17:48:12 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-07-31 23:03:27 +0200 |
| commit | 4a121f99f762258b4382b8a68f28094849fc3dfa (patch) | |
| tree | 01d04eb73e8ad166bd474a65b30ec44507616bd6 /Makefile.am | |
| parent | Merge pull request #881 from donaldsharp/ping_traceroute (diff) | |
| download | frr-4a121f99f762258b4382b8a68f28094849fc3dfa.tar.xz frr-4a121f99f762258b4382b8a68f28094849fc3dfa.zip | |
build: convert lib/ to non-recursive build
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 0092ba8c1..0ec8986b7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,18 +1,38 @@ ## Process this file with automake to produce Makefile.in. -SUBDIRS = lib qpb fpm @ZEBRA@ @LIBRFP@ @RFPTEST@ \ +AUTOMAKE_OPTIONS = subdir-objects 1.12 +include common.am + +AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib +AM_CFLAGS = $(WERROR) +DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" + +EXTRA_DIST = +BUILT_SOURCES = + +bin_PROGRAMS = +sbin_PROGRAMS = +noinst_PROGRAMS = +noinst_HEADERS = +noinst_LIBRARIES = +lib_LTLIBRARIES = +pkginclude_HEADERS = + +include lib/subdir.am + +SUBDIRS = . qpb fpm @ZEBRA@ @LIBRFP@ @RFPTEST@ \ @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ @LDPD@ \ @ISISD@ @PIMD@ @NHRPD@ @EIGRPD@ @BABELD@ \ @WATCHFRR@ @VTYSH@ @OSPFCLIENT@ @DOC@ m4 @pkgsrcdir@ \ redhat @SOLARIS@ tests tools snapcraft -DIST_SUBDIRS = lib qpb fpm zebra bgpd ripd ripngd ospfd ospf6d ldpd \ +DIST_SUBDIRS = . qpb fpm zebra bgpd ripd ripngd ospfd ospf6d ldpd \ isisd watchfrr vtysh ospfclient doc m4 pkgsrc redhat tests \ solaris pimd nhrpd eigrpd bgpd/rfp-example/librfp \ bgpd/rfp-example/rfptest tools snapcraft babeld python \ # end -EXTRA_DIST = aclocal.m4 SERVICES REPORTING-BUGS \ +EXTRA_DIST += aclocal.m4 SERVICES REPORTING-BUGS \ update-autotools \ vtysh/Makefile.in vtysh/Makefile.am \ tools/rrcheck.pl tools/rrlookup.pl tools/zc.pl \ @@ -20,4 +40,4 @@ EXTRA_DIST = aclocal.m4 SERVICES REPORTING-BUGS \ ACLOCAL_AMFLAGS = -I m4 -noinst_HEADERS = defaults.h +noinst_HEADERS += defaults.h |