From 9cd867c94aabb48f44658a7a4d6832115c876b74 Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Wed, 9 Apr 2014 00:19:49 -0400
Subject: [PATCH] Cleanup of autoconf files

---
 configure.ac           |  1 -
 src/cli/Makefile.am    |  4 +--
 src/common/Makefile.am | 58 ++++++++++++++++++++++++------------------
 src/gtk/Makefile.am    |  6 ++---
 4 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/configure.ac b/configure.ac
index e24e29c..f0d08ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,7 +125,6 @@ else
 fi
 
 AC_SUBST(WARNINGCFLAGS)
-AC_SUBST(LIBS)
 AC_SUBST(ac_aux_dir)
 
 dnl Creating output file(s)
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index d78b89e..692df69 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -2,8 +2,8 @@
 
 AM_CPPFLAGS = \
     $(WARNINGCFLAGS) \
-    -I@top_srcdir@ \
-    -I@top_srcdir@/src/common
+    -I$(top_srcdir)/src/common \
+    -I$(top_builddir)/src/common
 
 # Option -d: produce header file scanner.h
 AM_LFLAGS = --header-file=scanner.h
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 267c498..68f8191 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,40 +1,48 @@
 # This file is processed by GNU automake to generate Makefile.in
 
 AM_CPPFLAGS = \
-	$(WARNINGCFLAGS) \
-	-I$(top_srcdir)
+    $(WARNINGCFLAGS) \
+    -I$(builddir)
+
+VPATH = $(srcdir) $(builddir)
 
 noinst_LIBRARIES = libemu8051.a
 
+BUILT_SOURCES = \
+    instructions_8051.c instructions_8051.h \
+    opcodes.h opcodes.c
+
+PERL_SOURCES = \
+    opcodes2c.pl \
+    opcodes.lst
+
 libemu8051_a_SOURCES = \
-	instructions_8051.c instructions_8051.h \
-	opcodes.c opcodes.h \
-	options.c options.h \
-	log.c log.h \
-	hexfile.c hexfile.h \
-	cpu8051.c cpu8051.h \
-	memory.c memory.h \
-	psw.c psw.h \
-	sfr.c sfr.h \
-	operations.c operations.h \
-	timers.c timers.h \
-	common.h \
-	reg8051.h
+    options.c options.h \
+    log.c log.h \
+    hexfile.c hexfile.h \
+    cpu8051.c cpu8051.h \
+    memory.c memory.h \
+    psw.c psw.h \
+    sfr.c sfr.h \
+    operations.c operations.h \
+    timers.c timers.h \
+    common.h \
+    reg8051.h
+
+nodist_libemu8051_a_SOURCES = \
+    $(BUILT_SOURCES)
 
 # These files are generated automatically by a perl script.
-instructions_8051.c instructions_8051.h opcodes.h opcodes.c : opcodes2c.pl opcodes.lst
+$(BUILT_SOURCES) : $(PERL_SOURCES)
 	@echo "  PERL     opcodes2c.pl"
-	@./opcodes2c.pl
+	@$(srcdir)/opcodes2c.pl $(srcdir)/opcodes.lst $(builddir)
 
-CLEANFILES = *~
+CLEANFILES = \
+    *~ \
+    $(BUILT_SOURCES)
 
 MAINTAINERCLEANFILES = \
-	Makefile.in \
-	instructions_8051.c \
-	instructions_8051.h \
-	opcodes.h \
-	opcodes.c
+    Makefile.in
 
 EXTRA_DIST = \
-	opcodes2c.pl \
-	opcodes.lst
+    $(PERL_SOURCES)
diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am
index 989906d..7b81969 100644
--- a/src/gtk/Makefile.am
+++ b/src/gtk/Makefile.am
@@ -2,9 +2,9 @@
 
 AM_CPPFLAGS = \
     $(WARNINGCFLAGS) \
-    -I@top_srcdir@ \
-    -I@top_srcdir@/src/common \
     -I$(top_srcdir)/pixmaps \
+    -I$(top_srcdir)/src/common \
+    -I$(top_builddir)/src/common \
     @GTK_CFLAGS@ \
     @GLIB_CFLAGS@ \
     -DDATADIR=\"$(datadir)\" \
@@ -33,8 +33,6 @@ emu8051_gtk_SOURCES = \
     helpmenu.c helpmenu.h \
     messagebox.c messagebox.h
 
-EXTRA_DIST =
-
 CLEANFILES = *~
 
 MAINTAINERCLEANFILES = Makefile.in
-- 
2.20.1