Merge pull request #2267 from donaldsharp/flim_flam

[mirror_frr.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b4a0e02e7629864f7cd087e63b8cf696f6633f6a..431696430393199eacb7b6eff64ad40bdf9e5a29 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,9 +3,11 @@
 AUTOMAKE_OPTIONS = subdir-objects 1.12
 include common.am
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir) -I$(top_builddir)/lib
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/lib \
+             -I$(top_builddir) -I$(top_builddir)/include -I$(top_builddir)/lib
 AM_CFLAGS = $(WERROR)
-DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -DCONFDATE=$(CONFDATE)
+VERSION_TYPE := $(shell if echo $(VERSION) | grep -q '^[0-9\.]*$$'; then echo RELEASE ; else echo DEV ; fi)
+DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -DCONFDATE=$(CONFDATE) -DVERSION_TYPE_$(VERSION_TYPE)
 LIBCAP = @LIBCAP@
 
 EXTRA_DIST =
@@ -34,6 +36,7 @@ $(AUTOMAKE_DUMMY)install-moduleLTLIBRARIES: install-libLTLIBRARIES
 $(AUTOMAKE_DUMMY)install-binPROGRAMS: install-libLTLIBRARIES
 $(AUTOMAKE_DUMMY)install-sbinPROGRAMS: install-libLTLIBRARIES
 
+include include/subdir.am
 include lib/subdir.am
 include zebra/subdir.am
 include watchfrr/subdir.am
@@ -51,7 +54,9 @@ include nhrpd/subdir.am
 include ldpd/subdir.am
 include babeld/subdir.am
 include eigrpd/subdir.am
+include sharpd/subdir.am
 include pimd/subdir.am
+include pbrd/subdir.am
 
 SUBDIRS = . @LIBRFP@ @RFPTEST@ \
         @BGPD@ \
@@ -62,6 +67,7 @@ DIST_SUBDIRS = . bgpd \
          vtysh doc tests \
          solaris bgpd/rfp-example/librfp \
          bgpd/rfp-example/rfptest \
+         debianpkg \
          # end
 
 if PKGSRC
@@ -77,8 +83,6 @@ rc_SCRIPTS = \
 endif
 
 EXTRA_DIST += \
-       REPORTING-BUGS \
-       SERVICES \
        aclocal.m4 \
        update-autotools \
        m4/README.txt \
@@ -110,3 +114,6 @@ EXTRA_DIST += \
 ACLOCAL_AMFLAGS = -I m4
 
 noinst_HEADERS += defaults.h
+
+indent:
+       tools/indent.py `find sharpd bgpd eigrpd include isisd lib nhrpd ospf6d ospfd pimd qpb ripd vtysh zebra -name '*.[ch]' | grep -v include/linux`