From 1466890269b04da08adf7b3640698e75e9593f56 Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Sat, 8 Feb 2014 01:02:14 -0500 Subject: [PATCH 1/1] Rename CLI and GUI versions main source files --- src/cli/Makefile.am | 2 +- src/cli/{emuconsole.c => main.c} | 2 +- src/gtk/Makefile.am | 2 +- src/gtk/filemenu.c | 2 +- src/gtk/helpmenu.c | 2 +- src/gtk/{emugtk.c => main.c} | 4 ++-- src/gtk/{emugtk.h => main.h} | 8 ++++---- src/gtk/memwin.c | 2 +- src/gtk/pswwin.c | 2 +- src/gtk/regwin.c | 2 +- src/gtk/timerwin.c | 2 +- src/gtk/viewmenu.c | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) rename src/cli/{emuconsole.c => main.c} (98%) rename src/gtk/{emugtk.c => main.c} (99%) rename src/gtk/{emugtk.h => main.h} (94%) diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am index 3fba226..ac87424 100644 --- a/src/cli/Makefile.am +++ b/src/cli/Makefile.am @@ -15,7 +15,7 @@ bin_PROGRAMS = emu8051-cli emu8051_cli_SOURCES = \ parser.y scanner.l \ - emuconsole.c \ + main.c \ menu.c menu.h \ keyboard.c keyboard.h diff --git a/src/cli/emuconsole.c b/src/cli/main.c similarity index 98% rename from src/cli/emuconsole.c rename to src/cli/main.c index cbea820..bf71cf9 100644 --- a/src/cli/emuconsole.c +++ b/src/cli/main.c @@ -1,5 +1,5 @@ /* - * emuconsole.c + * main.c * * Copyright (C) 1999 Jonathan St-André * Copyright (C) 1999 Hugo Villeneuve diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am index 980609b..989906d 100644 --- a/src/gtk/Makefile.am +++ b/src/gtk/Makefile.am @@ -21,7 +21,7 @@ LDADD = \ bin_PROGRAMS = emu8051-gtk emu8051_gtk_SOURCES = \ - emugtk.c emugtk.h \ + main.c main.h \ app-config.c app-config.h \ memwin.c memwin.h \ pgmwin.c pgmwin.h \ diff --git a/src/gtk/filemenu.c b/src/gtk/filemenu.c index 1332bb0..8375607 100644 --- a/src/gtk/filemenu.c +++ b/src/gtk/filemenu.c @@ -28,7 +28,7 @@ #include #include "common.h" -#include "emugtk.h" +#include "main.h" #include "messagebox.h" #include "filemenu.h" diff --git a/src/gtk/helpmenu.c b/src/gtk/helpmenu.c index aa8e413..b280405 100644 --- a/src/gtk/helpmenu.c +++ b/src/gtk/helpmenu.c @@ -35,7 +35,7 @@ #include "common.h" #include "options.h" -#include "emugtk.h" +#include "main.h" #include "messagebox.h" #include "helpmenu.h" diff --git a/src/gtk/emugtk.c b/src/gtk/main.c similarity index 99% rename from src/gtk/emugtk.c rename to src/gtk/main.c index 3374d62..0750559 100644 --- a/src/gtk/emugtk.c +++ b/src/gtk/main.c @@ -1,5 +1,5 @@ /* - * emugtk.c + * main.c * * Copyright (C) 1999 Jonathan St-André * Copyright (C) 1999 Hugo Villeneuve @@ -33,7 +33,7 @@ #include "options.h" #include "hexfile.h" -#include "emugtk.h" +#include "main.h" #include "reset.xpm" #include "run.xpm" #include "stop.xpm" diff --git a/src/gtk/emugtk.h b/src/gtk/main.h similarity index 94% rename from src/gtk/emugtk.h rename to src/gtk/main.h index a590fab..d2f41e3 100644 --- a/src/gtk/emugtk.h +++ b/src/gtk/main.h @@ -1,5 +1,5 @@ /* - * emugtk.h + * main.h * * Copyright (C) 1999 Jonathan St-André * Copyright (C) 1999 Hugo Villeneuve @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef EMUGTK_H -#define EMUGTK_H 1 +#ifndef MAIN_H +#define MAIN_H 1 #include @@ -51,4 +51,4 @@ emugtk_destroy_ext_memory_paned(void); void emugtk_recreate_memory_paned(void); -#endif /* EMUGTK_H */ +#endif /* MAIN_H */ diff --git a/src/gtk/memwin.c b/src/gtk/memwin.c index c525fb1..a2b24a1 100644 --- a/src/gtk/memwin.c +++ b/src/gtk/memwin.c @@ -34,7 +34,7 @@ #include "cpu8051.h" #include "regwin.h" #include "memwin.h" -#include "emugtk.h" +#include "main.h" #include "options.h" #include "app-config.h" diff --git a/src/gtk/pswwin.c b/src/gtk/pswwin.c index 6b890d0..1d7a298 100644 --- a/src/gtk/pswwin.c +++ b/src/gtk/pswwin.c @@ -35,7 +35,7 @@ #include "psw.h" #include "instructions_8051.h" #include "hexfile.h" -#include "emugtk.h" +#include "main.h" static GtkWidget *pswlist; diff --git a/src/gtk/regwin.c b/src/gtk/regwin.c index a2b0f6e..dc2a292 100644 --- a/src/gtk/regwin.c +++ b/src/gtk/regwin.c @@ -35,7 +35,7 @@ #include "pgmwin.h" #include "instructions_8051.h" #include "hexfile.h" -#include "emugtk.h" +#include "main.h" static GtkWidget *reglist; diff --git a/src/gtk/timerwin.c b/src/gtk/timerwin.c index 2687c5a..bbf1a7c 100644 --- a/src/gtk/timerwin.c +++ b/src/gtk/timerwin.c @@ -29,7 +29,7 @@ #include "common.h" #include "timers.h" -#include "emugtk.h" +#include "main.h" static GtkWidget *label; diff --git a/src/gtk/viewmenu.c b/src/gtk/viewmenu.c index fa1fd14..fa1a383 100644 --- a/src/gtk/viewmenu.c +++ b/src/gtk/viewmenu.c @@ -26,7 +26,7 @@ #include #include "common.h" -#include "emugtk.h" /* For AddMenuSeparator() function. */ +#include "main.h" /* For AddMenuSeparator() function. */ #include "messagebox.h" #include "viewmenu.h" #include "app-config.h" -- 2.20.1