X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=Makefile.am;h=cfd1df10c5fb0487e3fe481de2dddff1ac0b1322;hb=HEAD;hp=83b08f2be0974673104dc4aac2911809b3797709;hpb=82756d98187cfc312892b0330b1bc888ffbde3ad;p=emu8051.git

diff --git a/Makefile.am b/Makefile.am
index 83b08f2..cfd1df1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +1,57 @@
 ## Makefile.am -- Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = gnu
+.PHONY: changelog
 
-SUBDIRS = src doc
+SUBDIRS = \
+    src/common \
+    src/cli \
+    src/gtk \
+    data \
+    doc \
+    tests
 
-EXTRA_DIST = autogen.sh \
-             $(ac_aux_dir)/debug.m4 \
-             pixmaps \
-             test-files
+## We want these in the dist tarball
+EXTRA_DIST = pixmaps
 
-ACLOCAL = aclocal -I $(ac_aux_dir)
+ACLOCAL_AMFLAGS = -I m4
+
+LIBTOOL_MACROS = \
+    m4/libtool.m4 \
+    m4/ltoptions.m4 \
+    m4/ltsugar.m4 \
+    m4/ltversion.m4 \
+    m4/lt~obsolete.m4
 
 CLEANFILES = *~
 
 DISTCLEANFILES = .deps/*.P
 
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config-h.in stamp-h.in \
-                       $(ac_aux_dir)/depcomp $(ac_aux_dir)/install-sh $(ac_aux_dir)/missing \
-                       $(ac_aux_dir)/mkinstalldirs $(ac_aux_dir)/config.guess \
-                       $(ac_aux_dir)/config.sub $(ac_aux_dir)/ltmain.sh
-
-
-
+MAINTAINERCLEANFILES = \
+    Makefile.in \
+    aclocal.m4 \
+    configure \
+    config-h.in \
+    stamp-h.in \
+    ChangeLog \
+    $(ac_aux_dir)/depcomp \
+    $(ac_aux_dir)/install-sh \
+    $(ac_aux_dir)/missing \
+    $(ac_aux_dir)/mkinstalldirs \
+    $(ac_aux_dir)/config.guess \
+    $(ac_aux_dir)/config.sub \
+    $(ac_aux_dir)/ltmain.sh \
+    $(ac_aux_dir)/compile \
+    $(ac_aux_dir)/test-driver \
+    $(ac_aux_dir)/ar-lib \
+    $(ac_aux_dir)/ylwrap \
+    $(LIBTOOL_MACROS)
+
+changelog:
+	@if test -d $(srcdir)/.git; then          \
+	  $(srcdir)/build-aux/gitlog-to-changelog \
+	    --format='%s%n%n%b%n'                 \
+	    --no-cluster                          \
+	    --strip-tab                           \
+	    --strip-cherry-pick                   \
+	    >ChangeLog;                           \
+	fi