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
+dist_doc_DATA = README.md NEWS CONTRIBUTE.md LICENSE
+doc_DATA = ChangeLog
-# Build changelog from git history
-dist-hook: $(distdir)/ChangeLog
__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 "" ; \
else \
touch $@ ; \
fi
-ChangeLog:
- touch $@
+
+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'
+
+