3 files changed, 6 insertions, 136 deletions
diff --git a/Makefile b/Makefile
index 32173a8..a428724 100644
--- a/Makefile
+++ b/Makefile
@@ -68,3 +68,9 @@ emucpm.hex: emucpm.z80
 
 clean:
 	rm -f emma $(BASE_O) $(EMMA_O) core *.hex *.lbl
+
+emma.o: emma.c z80.h z80_config.h expr.h
+expr.o: expr.c
+z80.o: z80.c z80.h z80_config.h z80_private.h
+z80_decode.o: z80_decode.c z80.h z80_config.h z80_private.h
+z80_dis.o: z80_dis.c z80_config.h z80.h z80_private.h
diff --git a/callbacks.c b/callbacks.c
deleted file mode 100644
index 2b8ffa9..0000000
--- a/callbacks.c
+++ /dev/null
@@ -1,90 +0,0 @@
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-#include <limits.h>
-
-#include "callbacks.h"
-#include "interface.h"
-#include "support.h"
-
-#include "gtkutil.h"
-#include "gemma.h"
-
-
-void CloseApplication(GtkObject *object, gpointer user_data)
-{
-    GEMMA_Stop();
-    gtk_main_quit();
-}
-
-
-void OnRun(GtkButton *button, gpointer user_data)
-{
-    GEMMA_Run();
-}
-
-
-void OnStep(GtkButton *button, gpointer user_data)
-{
-    GEMMA_Step();
-}
-
-
-void OnStepOver(GtkButton *button, gpointer user_data)
-{
-    GEMMA_StepOver();
-}
-
-
-void OnStop(GtkButton *button, gpointer user_data)
-{
-    GEMMA_Stop();
-}
-
-
-void OnLoadHEX(GtkButton *button, gpointer user_data)
-{
-    static char path[PATH_MAX]={0};
-
-    if (DialogFSelect("Open INTEL HEX File","INTEL HEX","*.hex",path))
-    {
-    	GEMMA_LoadHEX(path);
-    }
-}
-
-
-void OnLoadLabels(GtkButton *button, gpointer user_data)
-{
-    static char path[PATH_MAX]={0};
-
-    if (DialogFSelect("Open Label File","Labels","*.lbl",path))
-    {
-    	GEMMA_LoadLabels(path);
-    }
-}
-
-
-void OnRunUntil(GtkButton *button, gpointer user_data)
-{
-    GEMMA_RunUntil();
-}
-
-
-void OnQuit(GtkButton *button, gpointer user_data)
-{
-    GEMMA_Stop();
-    gtk_main_quit();
-}
-
-
-void OnMemoryViewChoice(GtkComboBox *combobox, gpointer user_data)
-{
-    GEMMA_UpdateDisplay(UPDATE_MEM_VIEW);
-}
-
-void OnViewMode(GtkToggleButton *togglebutton, gpointer user_data)
-{
-    GEMMA_UpdateDisplay(UPDATE_MEM_VIEW);
-}
diff --git a/callbacks.h b/callbacks.h
deleted file mode 100644
index e27c7be..0000000
--- a/callbacks.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <gtk/gtk.h>
-
-
-void
-CloseApplication                       (GtkObject       *object,
-                                        gpointer         user_data);
-
-void
-OnRun                                  (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-OnStep                                 (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-OnStepOver                             (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-OnStop                                 (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-OnLoadHEX                              (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-OnLoadLabels                           (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-OnRunUntil                             (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-OnQuit                                 (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-OnMemoryViewChoice                     (GtkComboBox     *combobox,
-                                        gpointer         user_data);
-
-void
-OnViewMode                             (GtkToggleButton *togglebutton,
-                                        gpointer         user_data);