Correct inclusion of standard if_tun.h header file.

[oweals/tinc.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index de63d112da2b2f5f65b4f3bae9ace70fee695d08..85c2c18680c5199d20f6e628a6ea4b423eb19a94 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,26 +2,36 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 lib cipher src doc po redhat debian
+SUBDIRS = m4 intl lib src doc po redhat
 
 ACLOCAL_AMFLAGS =
 
-EXTRA_DIST = 
+EXTRA_DIST = system.h COPYING.README
 
-CVS_CREATED = configure aclocal.m4 config.h.in config.guess \
+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
+ stamp-h.in m4/Makefile.am ChangeLog po/Makefile.in.in \
+ po/tinc.pot src/.libs intl
 
 ChangeLog:
-       rm -f ChangeLog
-       rcs2log -u "zarq        Ivo Timmermans  itimmermans@bigfoot.com" \
-         -u "guus      Guus Sliepen    guus@sliepen.warande.net" | \
-         sed -e 's,/home/CVS/tinc/cabal/,,g' > $@
+       cvs2cl -U cvsusers --fsf
 
 cvs-clean: maintainer-clean
-       for f in $(CVS_CREATED) `find -name Makefile.in` ; do\
-         rm -f "$$f"; \
+       for f in $(CVS_CREATED) `find -name Makefile.in` tinc-$(VERSION).tar.gz; do\
+         rm -Rf "$$f"; \
        done
 
 deb:
        dpkg-buildpackage -rfakeroot
+
+rpm: dist
+       cp $(distdir).tar.gz /usr/src/redhat/SOURCES/
+       cp redhat/tinc.spec /usr/src/redhat/SOURCES/
+       cd /usr/src/redhat/SOURCES/ && rpm -bb tinc.spec
+
+release:
+       rm -f ChangeLog
+       $(MAKE) ChangeLog
+       echo "Please edit the NEWS file now..."
+       /usr/bin/editor NEWS
+       $(MAKE) dist