projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix use-after-free in final log message on tincd exit.
[tinc]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
bda83a2
..
6f0f687
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-2,25
+2,24
@@
AUTOMAKE_OPTIONS = gnu
AUTOMAKE_OPTIONS = gnu
-SUBDIRS =
m4 intl lib src doc po redhat debian
+SUBDIRS =
src doc test systemd bash_completion.d
-ACLOCAL_AMFLAGS =
+ACLOCAL_AMFLAGS =
-I m4
-EXTRA_DIST =
system.h ABOUT-NLS COPYING.README autogen.sh
+EXTRA_DIST =
COPYING.README README.android SECURITY.md
-CVS_CREATED = 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
+@CODE_COVERAGE_RULES@
-ChangeLog:
- rm -f ChangeLog
- cvs2cl -U cvsusers --fsf
+# 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
-cvs-clean: maintainer-clean
- for f in $(CVS_CREATED) `find -name Makefile.in` ; do\
- rm -Rf "$$f"; \
- done
+# Triggering the README target means we are building a distribution (make dist).
+README: configure-version
+
+ChangeLog:
+ (cd $(srcdir) && git log) > ChangeLog
deb:
dpkg-buildpackage -rfakeroot
deb:
dpkg-buildpackage -rfakeroot
@@
-28,5
+27,14
@@
deb:
rpm: dist
cp $(distdir).tar.gz /usr/src/redhat/SOURCES/
cp redhat/tinc.spec /usr/src/redhat/SOURCES/
rpm: dist
cp $(distdir).tar.gz /usr/src/redhat/SOURCES/
cp redhat/tinc.spec /usr/src/redhat/SOURCES/
- cd /usr/src/redhat/SOURCES/
- rpm -bi tinc.spec
+ 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 $(srcdir)/NEWS
+ $(MAKE) dist
+
+astyle:
+ astyle --options=.astylerc -nQ src/*.[ch] src/*/*.[ch]