summaryrefslogtreecommitdiff
path: root/src/heretic/Makefile.am
diff options
context:
space:
mode:
authorSimon Howard2014-12-26 18:02:34 +0100
committerSimon Howard2014-12-26 18:02:34 +0100
commitb6ba5eb89afe488f66407562ff57da596e7c841e (patch)
tree478171822131f358da14d61cc062aa994a87dc00 /src/heretic/Makefile.am
parentba8400b38d8264fe28ec03f772348b288a6ed075 (diff)
parentd66659c6067ec18022718457bcf7c73145cf7b38 (diff)
downloadchocolate-doom-b6ba5eb89afe488f66407562ff57da596e7c841e.tar.gz
chocolate-doom-b6ba5eb89afe488f66407562ff57da596e7c841e.tar.bz2
chocolate-doom-b6ba5eb89afe488f66407562ff57da596e7c841e.zip
Merge pull request #495 from WinterMute/build-outside-source-dir
Allow building in subdirectory or outside source directory This one allows you to configure && make from a subdirectory or a directory outside the source tree. Useful for building several versions in the same tree for comparison.
Diffstat (limited to 'src/heretic/Makefile.am')
-rw-r--r--src/heretic/Makefile.am8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/heretic/Makefile.am b/src/heretic/Makefile.am
index bf834733..88ccc7b8 100644
--- a/src/heretic/Makefile.am
+++ b/src/heretic/Makefile.am
@@ -1,6 +1,6 @@
-AM_CFLAGS=-I.. \
- -I$(top_builddir)/textscreen \
+AM_CFLAGS=-I$(top_srcdir)/src \
+ -I$(top_srcdir)/textscreen \
@SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
noinst_LIBRARIES=libheretic.a
@@ -51,11 +51,11 @@ r_segs.c \
r_things.c \
sb_bar.c \
sounds.c sounds.h \
-s_sound.c s_sound.h
+s_sound.c s_sound.h
EXTRA_DIST= \
i_sound.c \
-i_ibm.c
+i_ibm.c
FEATURE_DEHACKED_SOURCE_FILES = \
deh_ammo.c \