diff options
| author | Simon Howard | 2007-03-09 22:50:48 +0000 |
|---|---|---|
| committer | Simon Howard | 2007-03-09 22:50:48 +0000 |
| commit | d4056662a4c70bf2817d470694a3506bb35f0b7f (patch) | |
| tree | 1c7d971df1f0d28bf6a57d8cb4ff77c2b405f2b5 /src/Makefile.am | |
| parent | 7ebeb39398f0e7fbdda6393ef2a251b0f2a42f54 (diff) | |
| download | chocolate-doom-d4056662a4c70bf2817d470694a3506bb35f0b7f.tar.gz chocolate-doom-d4056662a4c70bf2817d470694a3506bb35f0b7f.tar.bz2 chocolate-doom-d4056662a4c70bf2817d470694a3506bb35f0b7f.zip | |
Move the pcsound library to the top level, alongside textscreen.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 849
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 53ef775c..4d694293 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ gamesdir = $(prefix)/games games_PROGRAMS = chocolate-doom chocolate-server -AM_CFLAGS = -I../textscreen @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@ +AM_CFLAGS = -I../textscreen -I../pcsound @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@ DEDSERV_FILES=\ d_dedicated.c \ @@ -22,8 +22,6 @@ z_native.c z_zone.h chocolate_server_SOURCES=$(DEDSERV_FILES) chocolate_server_LDADD = @LDFLAGS@ @SDL_LIBS@ @SDLNET_LIBS@ -SUBDIRS=pcsound - SOURCE_FILES=\ am_map.c am_map.h \ deh_ammo.c \ @@ -141,7 +139,7 @@ else chocolate_doom_SOURCES=$(SOURCE_FILES) endif -chocolate_doom_LDADD = ../textscreen/libtextscreen.a pcsound/libpcsound.a @LDFLAGS@ @SDL_LIBS@ @SDLMIXER_LIBS@ @SDLNET_LIBS@ +chocolate_doom_LDADD = ../textscreen/libtextscreen.a ../pcsound/libpcsound.a @LDFLAGS@ @SDL_LIBS@ @SDLMIXER_LIBS@ @SDLNET_LIBS@ EXTRA_DIST = \ chocolate_doom_icon.c \ |