lib: don't break ABI by moving new config_tx_interval_ms to end

[thirdparty/lldpd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 71711f58459bb736787eca0e7313f16e1c5e2284..80abf73ec849ee8acb2a1a9c06c2b9cedc96c8ff 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,23 +2,22 @@ include doxygen.am
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS      = src/compat src src/daemon src/lib src/client tests
-EXTRA_DIST   = $(DX_CONFIG) include
+SUBDIRS      = src/compat src src/daemon src/lib src/client tests osx
+EXTRA_DIST   = $(DX_CONFIG) include get-version autogen.sh
 DIST_SUBDIRS = $(SUBDIRS) libevent
+DISTCLEANFILES = ChangeLog
 
-dist_doc_DATA = README.md NEWS ChangeLog VERSION
+dist_doc_DATA = README.md NEWS CONTRIBUTE.md LICENSE
+doc_DATA = ChangeLog
 
-dist-hook: $(distdir)/ChangeLog $(distdir)/VERSION
-
-# Build changelog from git history
 __force-changelog-generation:
-$(distdir)/ChangeLog: __force-changelog-generation
-       $(AM_V_GEN)if test -d $(top_srcdir)/.git; then \
+ChangeLog: __force-changelog-generation
+       $(AM_V_GEN)if test -e $(top_srcdir)/.git; then \
                prev=$$(git describe --tags --always --match '[0-9]*' 2> /dev/null) ; \
-               for tag in $$(git tag | grep -E '^[0-9]+(\.[0-9]+){1,}$$' | sort -rn); do \
+               for tag in $$(git tag | $(EGREP) '^[0-9]+(\.[0-9]+){1,}$$' | sort -t. -k 1,1nr -k 2,2nr -k 3,3nr); do \
                        if [ x"$$prev" = x ]; then prev=$$tag ; fi ; \
                        if [ x"$$prev" = x"$$tag" ]; then continue; fi ; \
-                       echo "$$prev [$$(git log $$prev -1 --pretty=format:'%ai')]:" ; \
+                       echo "$$prev [$$(git log --no-merges $$prev -1 --pretty=format:'%ai')]:" ; \
                        echo "" ; \
                        git log --pretty=' - [%h] %s (%an)' $$tag..$$prev ; \
                        echo "" ; \
@@ -27,18 +26,19 @@ $(distdir)/ChangeLog: __force-changelog-generation
        else \
                touch $@ ; \
        fi
-ChangeLog:
-       touch $@
-
-# Keep current version in a file in case we need to regenerate outside of git
-__force-VERSION-generation:
-$(distdir)/VERSION: __force-VERSION-generation
-       $(AM_V_GEN)if test -d $(top_srcdir)/.git; then \
-               git describe --tags --always --match '[0-9]*' 2> /dev/null > $@ ; \
-       else \
-               touch $@ ; \
-       fi
-VERSION:
-       touch VERSION
+
+dist-hook:
+       echo $(VERSION) > $(distdir)/.dist-version
 
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
+
+# systemd and launchd files are not installed in the prefix, don't
+# request them for distcheck
+DISTCHECK_CONFIGURE_FLAGS = $(CONFIGURE_ARGS) \
+        --with-sysusersdir=no \
+        --with-systemdsystemunitdir=no \
+       --with-launchddaemonsdir=no \
+       --with-apparmordir=no \
+       --sysconfdir='$$(prefix)/etc'
+
+