Code simplification and cleanup

[emu8051.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index f17fac9..60133a7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,26 +2,26 @@
 
 INCLUDES = -I$(top_srcdir)/pixmaps
 
-bin_PROGRAMS = emu8051 emu8051_console
+bin_PROGRAMS = emu8051
+# emu8051_console
 
-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
+emu8051_SOURCES = cpu8051.c emugtk.c memory.c memwin.c pgmwin.c regwin.c options.c hexfile.c \
+                  instructions_8051.c filemenu.c viewmenu.c helpmenu.c messagebox.c
 
-emu8051_console_SOURCES = EmuConsole.hpp EmuConsole.cpp CPU8051.hpp CPU8051.cpp Memory.hpp \
-                          Memory.cpp Keyboard.hpp
+#emu8051_console_SOURCES = EmuConsole.cpp cpu8051.c memory.c options.c file.c
 
 # 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 = EmuConsole.hpp Keyboard.hpp reg8051.h gtksizes.h hexfile.h filemenu.h \
+                 filemenu.h viewmenu.h helpmenu.h messagebox.h pgmwin.h memwin.h regwin.h
 
 CLEANFILES     = *~
 
 DISTCLEANFILES = .deps/*.P
 
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in instructions_8051.c instructions_8051.h disasm.h
 
-EXTRA_DIST = Opcode2cpp.pl opcodes.lst Inst_Imp.cpp
+EXTRA_DIST = opcode2c.pl opcodes.lst instructions_8051.h
 
 # 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
@@ -32,6 +32,3 @@ EXTRA_DIST = Opcode2cpp.pl opcodes.lst Inst_Imp.cpp
 #    gcc -DHAVE_CONFIG_H -I. -I. -I.. -c `test -f 'main.c' || echo './'`main.c
 .c.o:
        $(COMPILE) -c $<
-
-.cpp.o:
-       $(CXXCOMPILE) -c $<