summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2005-10-09 21:19:41 +0000
committerSimon Howard2005-10-09 21:19:41 +0000
commita7f36c7c511a94dadb2864d05424b9a33034b8d0 (patch)
tree67a08be7ba5becab72aaf38c2fefe4f8cff9e2bf
parent443163fc15088ab226234e9a4509eb3183574217 (diff)
downloadchocolate-doom-a7f36c7c511a94dadb2864d05424b9a33034b8d0.tar.gz
chocolate-doom-a7f36c7c511a94dadb2864d05424b9a33034b8d0.tar.bz2
chocolate-doom-a7f36c7c511a94dadb2864d05424b9a33034b8d0.zip
Include libtextscreen include in the right place, include deh_main.h
in the dist. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 184
-rw-r--r--src/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 10c72379..71cc4928 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ bindir = $(prefix)/bin
bin_PROGRAMS = chocolate-doom
AM_CFLAGS = -I../textscreen @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@ -Wall
-chocolate_doom_LDADD = @LDFLAGS@ @SDL_LIBS@ @SDLMIXER_LIBS@ @SDLNET_LIBS@ ../textscreen/libtextscreen.a
+chocolate_doom_LDADD = ../textscreen/libtextscreen.a @LDFLAGS@ @SDL_LIBS@ @SDLMIXER_LIBS@ @SDLNET_LIBS@
SOURCE_FILES=\
am_map.c d_think.h i_video.c p_floor.c p_tick.c r_things.h \
@@ -30,7 +30,7 @@ dstrings.h i_system.c p_doors.c p_switch.c r_state.h mmus2mid.c \
d_textur.h i_system.h p_enemy.c p_telept.c r_things.c mmus2mid.h \
deh_defs.h deh_frame.c deh_main.c deh_ptr.c deh_text.c deh_thing.c \
deh_io.c deh_io.h deh_ammo.c deh_cheat.c deh_weapon.c \
-deh_misc.c deh_mapping.c deh_mapping.h deh_sound.c \
+deh_misc.c deh_mapping.c deh_mapping.h deh_sound.c deh_main.h \
w_merge.c w_merge.h