Don't assume sa.sa_family is a short int.

[tinc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bbfa014..177f549 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,24 +2,22 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 intl lib src doc po
+SUBDIRS =  src doc gui test systemd
 
-ACLOCAL_AMFLAGS =
+ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = system.h COPYING.README
+EXTRA_DIST = COPYING.README README.android
 
-CVS_CREATED = ABOUT-NLS configure aclocal.m4 config.h.in config.guess \
- config.sub install-sh ltconfig ltmain.sh missing mkinstalldirs \
- stamp-h.in m4/Makefile.am ChangeLog po/Makefile.in.in \
- po/tinc.pot src/.libs intl
+# If git describe works, force autoconf to run in order to make sure we have the
+# current version number from git in the resulting configure script.
+configure-version:
+       -cd $(srcdir) && git describe && autoconf --force
 
-ChangeLog:
-       cvs2cl -U cvsusers --fsf
+# Triggering the README target means we are building a distribution (make dist).
+README: configure-version
 
-cvs-clean: maintainer-clean
-       for f in $(CVS_CREATED) `find -name Makefile.in` tinc-$(VERSION).tar.gz; do\
-         rm -Rf "$$f"; \
-       done
+ChangeLog:
+       (cd $(srcdir) && git log) > ChangeLog
 
 deb:
        dpkg-buildpackage -rfakeroot
@@ -33,5 +31,5 @@ release:
        rm -f ChangeLog
        $(MAKE) ChangeLog
        echo "Please edit the NEWS file now..."
-       /usr/bin/editor NEWS
+       /usr/bin/editor $(srcdir)/NEWS
        $(MAKE) dist