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

diff --git a/Makefile.am b/Makefile.am
index a9c5d47..cfd1df1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,28 +2,49 @@
 
 .PHONY: changelog
 
-AUTOMAKE_OPTIONS = gnu
-
-SUBDIRS = src/common src/cli src/gtk data doc tests
+SUBDIRS = \
+    src/common \
+    src/cli \
+    src/gtk \
+    data \
+    doc \
+    tests
 
 ## We want these in the dist tarball
-EXTRA_DIST = autogen.sh \
-             pixmaps
+EXTRA_DIST = pixmaps
+
+ACLOCAL_AMFLAGS = -I m4
 
-ACLOCAL = aclocal -I $(ac_aux_dir)
+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 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
+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          \