X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2FMakefile.am;h=1c8beaf1b3ea800911675b8e62371cf5bc8c1174;hb=fb3b3529579773b8a14959cc6bc5bb2096fd0fe8;hp=f17fac9edb36207d2b43c68617e72f12e5f8cf97;hpb=1c6cc28cf5317f2ee9fbc1a408bcaaef3b7378b3;p=emu8051.git

diff --git a/src/Makefile.am b/src/Makefile.am
index f17fac9..1c8beaf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,37 +1,38 @@
 # This file is processed by GNU automake to generate Makefile.in
 
-INCLUDES = -I$(top_srcdir)/pixmaps
+INCLUDES = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/pixmaps \
+	$(GTK_CFLAGS)
 
-bin_PROGRAMS = emu8051 emu8051_console
+bin_PROGRAMS = emu8051
 
-emu8051_SOURCES = EmuGtk.hpp EmuGtk.cpp CPU8051.hpp CPU8051.cpp Memory.hpp Memory.cpp \
-                  MemWin.hpp MemWin.cpp PgmWin.hpp PgmWin.cpp RegWin.hpp RegWin.cpp
+# instructions_8051.c must be first, because it and other files (instructions_8051.h and
+# disasm.h) are automatically generated by a perl script, and other source files include
+# them (the .h).
+emu8051_SOURCES = instructions_8051.c options.c hexfile.c cpu8051.c memory.c
 
-emu8051_console_SOURCES = EmuConsole.hpp EmuConsole.cpp CPU8051.hpp CPU8051.cpp Memory.hpp \
-                          Memory.cpp Keyboard.hpp
+if USE_GTK
+  emu8051_SOURCES += emugtk.c memwin.c pgmwin.c regwin.c filemenu.c viewmenu.c helpmenu.c messagebox.c
+  emu8051_LDADD = $(GTK_LIBS)
+else
+  emu8051_SOURCES += emuconsole.c keyboard.c
+endif
 
 # These headers will be included in the distribution tarball, but will not be
 # installed by 'make install'
-noinst_HEADERS = Inst_Def.hpp EmuConsole.hpp Keyboard.hpp Reg8051.hpp GtkSizes.hpp disasm.hpp \
-                 exceptions.hpp
+noinst_HEADERS = common.h emugtk.h memwin.h pgmwin.h regwin.h filemenu.h viewmenu.h helpmenu.h \
+                 messagebox.h options.h hexfile.h cpu8051.h memory.h reg8051.h gtksizes.h \
+                 keyboard.h
+
+# These files are generated automatically by a perl script.
+instructions_8051.c instructions_8051.h disasm.h : opcode2c.pl opcodes.lst
+	./opcode2c.pl
 
 CLEANFILES     = *~
 
 DISTCLEANFILES = .deps/*.P
 
-MAINTAINERCLEANFILES = Makefile.in
-
-EXTRA_DIST = Opcode2cpp.pl opcodes.lst Inst_Imp.cpp
-
-# This rule is used to bypass the default rule which is generated by Automake, in order
-# to get rid of all the cluttered informations that are displayed by Make before
-# calling the compiler like in the following example:
-#    source='programming.c' object='programming.o' libtool=no \
-#    depfile='.deps/programming.Po' tmpdepfile='.deps/programming.TPo' \
-#    depmode=gcc3 /bin/sh ../config/depcomp \
-#    gcc -DHAVE_CONFIG_H -I. -I. -I.. -c `test -f 'main.c' || echo './'`main.c
-.c.o:
-	$(COMPILE) -c $<
+MAINTAINERCLEANFILES = Makefile.in instructions_8051.c instructions_8051.h disasm.h
 
-.cpp.o:
-	$(CXXCOMPILE) -c $<
+EXTRA_DIST = opcode2c.pl opcodes.lst instructions_8051.h disasm.h