Rename some files to be package name independent.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1024

17 files changed, 38 insertions, 36 deletions

diff --git a/Makefile.am b/Makefile.am
index 3ce1494b..a085190a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,11 +23,11 @@ CODEBLOCKS_FILES=                              \
         codeblocks/config.h                    \
         codeblocks/libpcsound.cbp
 
-DATA_FILES=                             \
-        data/chocolate-doom.ico         \
-        data/chocolate-doom.png         \
-        data/chocolate-setup.ico        \
-        data/chocolate-setup.png        \
+DATA_FILES=                   \
+        data/doom.ico         \
+        data/doom.png         \
+        data/setup.ico        \
+        data/setup.png        \
         data/convert-icon
 
 EXTRA_DIST=                             \
diff --git a/configure.in b/configure.in
index d942c3af..07efe457 100644
--- a/configure.in
+++ b/configure.in
@@ -76,7 +76,8 @@ setup/Makefile
 man/Makefile
 src/Makefile
 pcsound/Makefile
-src/chocolate-doom-res.rc
-setup/chocolate-setup-res.rc
+src/resource.rc
+src/doom-screensaver.desktop
+setup/setup-res.rc
 ])
 
diff --git a/data/convert-icon b/data/convert-icon
index 16412378..d79648b2 100755
--- a/data/convert-icon
+++ b/data/convert-icon
@@ -41,7 +41,7 @@ def convert_image(filename, output_filename):
 
     size = im.size
 
-    struct_name = os.path.basename(filename)
+    struct_name = os.path.basename(output_filename)
     struct_name = re.sub(re.compile("\\..*$"), "", struct_name)
     struct_name = re.sub(re.compile("\W"), "_", struct_name)
 
diff --git a/data/chocolate-doom.ico b/data/doom.ico
index 602d32d4..602d32d4 100644
--- a/data/chocolate-doom.ico
+++ b/data/doom.ico
diff --git a/data/chocolate-doom.png b/data/doom.png
index 6d58b874..6d58b874 100644
--- a/data/chocolate-doom.png
+++ b/data/doom.png
diff --git a/data/chocolate-setup.ico b/data/setup.ico
index 32a0b761..32a0b761 100644
--- a/data/chocolate-setup.ico
+++ b/data/setup.ico
diff --git a/data/chocolate-setup.png b/data/setup.png
index 152999d3..152999d3 100644
--- a/data/chocolate-setup.png
+++ b/data/setup.png
diff --git a/setup/Makefile.am b/setup/Makefile.am
index 10085218..670d8cde 100644
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -23,10 +23,10 @@ SOURCE_FILES =                                  \
     txt_mouseinput.c  txt_mouseinput.h
 
 EXTRA_DIST=                                     \
-    chocolate_setup_icon.c
+    setup_icon.c
 
 if HAVE_WINDRES
-chocolate_setup_SOURCES=$(SOURCE_FILES) chocolate-setup-res.rc
+chocolate_setup_SOURCES=$(SOURCE_FILES) setup-res.rc
 else
 chocolate_setup_SOURCES=$(SOURCE_FILES)
 endif
@@ -38,7 +38,7 @@ endif
 
 if HAVE_PYTHON
 
-chocolate_setup_icon.c : ../data/chocolate-setup.png
+setup_icon.c : ../data/setup.png
 	../data/convert-icon $^ $@
 
 endif
diff --git a/setup/execute.c b/setup/execute.c
index 39fd5958..b5b8a7c6 100644
--- a/setup/execute.c
+++ b/setup/execute.c
@@ -37,14 +37,15 @@
 
 #include "textscreen.h"
 
+#include "config.h"
 #include "configfile.h"
 #include "execute.h"
 #include "m_argv.h"
 
 #ifdef _WIN32
-#define DOOM_BINARY "chocolate-doom.exe"
+#define DOOM_BINARY PACKAGE_TARNAME ".exe"
 #else
-#define DOOM_BINARY INSTALL_DIR "/chocolate-doom"
+#define DOOM_BINARY INSTALL_DIR "/" PACKAGE_TARNAME
 #endif
 
 #ifdef _WIN32
diff --git a/setup/mainmenu.c b/setup/mainmenu.c
index 71643400..335bd61b 100644
--- a/setup/mainmenu.c
+++ b/setup/mainmenu.c
@@ -28,7 +28,7 @@
 #include "configfile.h"
 #include "m_argv.h"
 
-#include "chocolate_setup_icon.c"
+#include "setup_icon.c"
 
 #include "compatibility.h"
 #include "display.h"
@@ -152,11 +152,11 @@ static void SetIcon(void)
 {
     SDL_Surface *surface;
 
-    surface = SDL_CreateRGBSurfaceFrom(chocolate_setup_data,
-                                       chocolate_setup_w,
-                                       chocolate_setup_h,
+    surface = SDL_CreateRGBSurfaceFrom(setup_icon_data,
+                                       setup_icon_w,
+                                       setup_icon_h,
                                        24,
-                                       chocolate_setup_w * 3,
+                                       setup_icon_w * 3,
                                        0xff << 0,
                                        0xff << 8,
                                        0xff << 16,
diff --git a/setup/chocolate-setup-res.rc.in b/setup/setup-res.rc.in
index cb49a1b2..cb49a1b2 100644
--- a/setup/chocolate-setup-res.rc.in
+++ b/setup/setup-res.rc.in
diff --git a/setup/chocolate_setup_icon.c b/setup/setup_icon.c
index 57270950..23459716 100644
--- a/setup/chocolate_setup_icon.c
+++ b/setup/setup_icon.c
@@ -1,7 +1,7 @@
-static int chocolate_setup_w = 32;
-static int chocolate_setup_h = 32;
+static int setup_icon_w = 32;
+static int setup_icon_h = 32;
 
-static unsigned char chocolate_setup_data[] = {
+static unsigned char setup_icon_data[] = {
     0xff,0xff,0xff,  0xff,0xff,0xff,  0xff,0xff,0xff,  0xff,0xff,0xff,  
     0xff,0xff,0xff,  0xff,0xff,0xff,  0xff,0xff,0xff,  0xff,0xff,0xff,  
     0xff,0xff,0xff,  0xff,0xff,0xff,  0xff,0xff,0xff,  0xff,0xff,0xff,  
diff --git a/src/Makefile.am b/src/Makefile.am
index f2f9f140..4358d6e2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -158,16 +158,16 @@ SOURCE_FILES = $(MAIN_SOURCE_FILES)                \
                $(FEATURE_SOUND_SOURCE_FILES)
 
 if HAVE_WINDRES
-chocolate_doom_SOURCES=$(SOURCE_FILES) chocolate-doom-res.rc
+chocolate_doom_SOURCES=$(SOURCE_FILES) resource.rc
 else
 chocolate_doom_SOURCES=$(SOURCE_FILES)
 endif
 
 chocolate_doom_LDADD = ../textscreen/libtextscreen.a ../pcsound/libpcsound.a @LDFLAGS@ @SDL_LIBS@ @SDLMIXER_LIBS@ @SDLNET_LIBS@ 
 
-EXTRA_DIST =                               \
-        chocolate_doom_icon.c              \
-        chocolate-doom-screensaver.desktop
+EXTRA_DIST =                        \
+        icon.c                      \
+        doom-screensaver.desktop.in
 
 .rc.o:
 	$(WINDRES) $^ -o $@
@@ -176,7 +176,7 @@ EXTRA_DIST =                               \
 
 if HAVE_PYTHON
 
-chocolate_doom_icon.c : ../data/chocolate-doom.png
+icon.c : ../data/doom.png
 	../data/convert-icon $^ $@
 
 endif
diff --git a/src/chocolate-doom-screensaver.desktop b/src/doom-screensaver.desktop.in
index d90127a3..cee79c2d 100644
--- a/src/chocolate-doom-screensaver.desktop
+++ b/src/doom-screensaver.desktop.in
@@ -3,8 +3,8 @@
 Encoding=UTF-8
 Name=Doom
 Comment=DOOM by Id Software.
-TryExec=chocolate-doom
-Exec=chocolate-doom
+TryExec=@PACKAGE_TARNAME@
+Exec=@PACKAGE_TARNAME@
 StartupNotify=false
 Terminal=false
 Type=Application
diff --git a/src/i_video.c b/src/i_video.c
index 568f0f7d..7732c63d 100644
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -30,7 +30,7 @@
 #include <ctype.h>
 #include <math.h>
 
-#include "chocolate_doom_icon.c"
+#include "icon.c"
 
 #include "config.h"
 #include "deh_main.h"
@@ -850,11 +850,11 @@ void I_SetWindowIcon(void)
 {
     SDL_Surface *surface;
 
-    surface = SDL_CreateRGBSurfaceFrom(chocolate_doom_data,
-                                       chocolate_doom_w,
-                                       chocolate_doom_h,
+    surface = SDL_CreateRGBSurfaceFrom(icon_data,
+                                       icon_w,
+                                       icon_h,
                                        24,
-                                       chocolate_doom_w * 3,
+                                       icon_w * 3,
                                        0xff << 0,
                                        0xff << 8,
                                        0xff << 16,
diff --git a/src/chocolate_doom_icon.c b/src/icon.c
index 51feba09..3a967e72 100644
--- a/src/chocolate_doom_icon.c
+++ b/src/icon.c
@@ -1,7 +1,7 @@
-static int chocolate_doom_w = 32;
-static int chocolate_doom_h = 32;
+static int icon_w = 32;
+static int icon_h = 32;
 
-static unsigned char chocolate_doom_data[] = {
+static unsigned char icon_data[] = {
     0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
     0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
     0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
diff --git a/src/chocolate-doom-res.rc.in b/src/resource.rc.in
index a6635932..a6635932 100644
--- a/src/chocolate-doom-res.rc.in
+++ b/src/resource.rc.in