Update .gitignore file.

[sigrok-gtk.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ad59c2d00a46c6cfafb5998cdfd41abdaac7da88..3e5aadd7617a803e590c1495e0a9b5ae552505d1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,6 +17,10 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
+SUBDIRS = contrib doc
+
+ACLOCAL_AMFLAGS = -I autostuff
+
 bin_PROGRAMS = sigrok-gtk
 
 sigrok_gtk_SOURCES = main.c log.c toolbar.c gtkcellrenderersignal.c \
@@ -41,3 +45,11 @@ endif
 .rc.o:
        $(WINDRES) -o $@ $^
 
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+ChangeLog:
+       git --git-dir $(top_srcdir)/../.git log > ChangeLog || touch ChangeLog
+
+dist-hook: ChangeLog
+