foxygit / doom Log in
commit 8f0c7980d2a2605b8344a2e158f923bb532ea8a9
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Mon Dec 1 21:16:13 2008 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Mon Dec 1 21:16:13 2008 +0000

    Fix make dist.

    Subversion-branch: /branches/raven-branch
    Subversion-revision: 1395
---
 Makefile.am             | 38 +++++++++++++++++++++++---------------
 src/heretic/Makefile.am |  2 +-
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 40de5828..92939fbf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,25 +3,33 @@ AUX_DIST_GEN =                          \
         $(ac_aux_dir)/missing

 MSVC_FILES=                             \
-        msvc/README                     \
+        msvc/chocolate.sln              \
         msvc/config.h                   \
+        msvc/doom.vcproj                \
+        msvc/heretic.vcproj             \
+        msvc/hexen.vcproj               \
         msvc/inttypes.h                 \
+        msvc/libpcsound.vcproj          \
+        msvc/libtextscreen.vcproj       \
+        msvc/README                     \
+        msvc/server.vcproj              \
+        msvc/setup.vcproj               \
         msvc/stdint.h                   \
-        msvc/win32.rc                   \
-        msvc/ChocolateDoom.sln          \
-        msvc/ChocolateDoom.vcproj
+        msvc/win32.rc

 CODEBLOCKS_FILES=                              \
-	codeblocks/config.h                    \
-	codeblocks/game.cbp                    \
-	codeblocks/game-res.rc                 \
-	codeblocks/libpcsound.cbp              \
-	codeblocks/main.workspace              \
-	codeblocks/README                      \
-	codeblocks/server.cbp                  \
-	codeblocks/setup.cbp                   \
-	codeblocks/setup-res.rc                \
-	codeblocks/textscreen.cbp
+        codeblocks/chocolate.workspace         \
+        codeblocks/config.h                    \
+        codeblocks/doom.cbp                    \
+        codeblocks/game-res.rc                 \
+        codeblocks/heretic.cbp                 \
+        codeblocks/hexen.cbp                   \
+        codeblocks/libpcsound.cbp              \
+        codeblocks/libtextscreen.cbp           \
+        codeblocks/README                      \
+        codeblocks/server.cbp                  \
+        codeblocks/setup.cbp                   \
+        codeblocks/setup-res.rc

 DATA_FILES=                   \
         data/doom.ico         \
@@ -44,7 +52,7 @@ EXTRA_DIST=                             \
 MAINTAINERCLEANFILES =  $(AUX_DIST_GEN)

 docdir=$(prefix)/share/doc/@PACKAGE@
-SUBDIRS=textscreen pcsound src man setup
+SUBDIRS=textscreen pcsound src man

 if HAVE_PYTHON

diff --git a/src/heretic/Makefile.am b/src/heretic/Makefile.am
index ab7dc1d4..6c54c0b8 100644
--- a/src/heretic/Makefile.am
+++ b/src/heretic/Makefile.am
@@ -50,7 +50,7 @@ sounds.c               sounds.h                      \
 s_sound.c              s_sound.h

 EXTRA_DIST=                                          \
-i_sound.c              i_sound.h                     \
+i_sound.c                                            \
 i_ibm.c

 libheretic_a_SOURCES=$(SOURCE_FILES)