From 6b58d48133a8a322fae4431c6e856abb7f8ce688 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Mon, 29 Jan 2001 14:09:49 +0000
Subject: [PATCH] Fixes to build system

---
 configure.in     | 17 +++++++++++++----
 main/Makefile.am | 43 +++++++++++++++++++------------------------
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/configure.in b/configure.in
index 89244044..e59ef100 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(main/game.c)
+AC_INIT(main/inferno.c)
 
 AM_CONFIG_HEADER(conf.h)
 AM_INIT_AUTOMAKE(d2x, 0.0.9)
@@ -34,13 +34,13 @@ AC_ARG_ENABLE(ndebug,
   esac],)
 
 # Test for DJGPP
+AM_CONDITIONAL(ENV_DJGPP, test "$OSTYPE" = "MSDOS")
 if test "$OSTYPE" = "MSDOS"; then
 
   CFLAGS="-I \$(top_srcdir)/arch/dos/include $CFLAGS"
-  AM_CONDITIONAL(ENV_DJGPP, test "$OSTYPE" = "MSDOS")
   AC_DEFINE(__ENV_DJGPP__)
   AC_PATH_PROG(NASM, nasmw, no)
-
+  TARGETS=d2x
 
 else
   CFLAGS="-D_REENTRANT -pipe $CFLAGS"
@@ -122,18 +122,23 @@ else
 
   if test x$opengl = xtrue; then
     AC_DEFINE(OGL)
+    TARGETS=d2x-ogl
   else
     if test x$svga = xtrue; then
       AC_DEFINE(SVGA)
+      TARGETS=d2x-svga
     else
       if test x$ggi = xtrue; then
         AC_DEFINE(GGI)
+        TARGETS=d2x-ggi
+      else
+        TARGETS=d2x-sdl
       fi
     fi
   fi
 
   AC_PATH_PROG(NASM, nasm, no)
-  CFLAGS="-I \$(top_srcdir)/input/linux/include -I \$(top_srcdir)/arch/linux/include $CFLAGS"
+  CFLAGS="-I\$(top_srcdir)/input/linux/include -I\$(top_srcdir)/arch/linux/include $CFLAGS"
 
 fi
 
@@ -175,10 +180,14 @@ if test "$NO_NETWORK" = 0; then
         AC_DEFINE(NETWORK)
 fi
 AM_CONDITIONAL(USE_ASM, test "$NO_ASM" != 1)
+AM_CONDITIONAL(USE_NETWORK, test "$NO_NETWORK" != 1)
+
 AC_SUBST(NASMFLAGS)
 
 AC_SUBST(CFLAGS)
 
+AC_SUBST(TARGETS)
+
 AC_ARG_PROGRAM
 
 #libdir='$(shell pwd)/${top_srcdir}/main'
diff --git a/main/Makefile.am b/main/Makefile.am
index 83f561f3..1051c351 100644
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -1,8 +1,21 @@
 SUBDIRS = editor old
 
-INCLUDES = -I$(top_srcdir)/includes -I$(top_srcdir)/arch/include -fwritable-strings
+CFLAGS += -fwritable-strings
 
-bin_PROGRAMS = d2x
+INCLUDES = -I$(top_srcdir)/includes -I$(top_srcdir)/arch/include
+
+bin_PROGRAMS = @TARGETS@
+
+EXTRA_PROGRAMS = d2x d2x-sdl d2x-ogl d2x-svga d2x-ggi
+
+LDFLAGS = -export-dynamic
+
+d2x_LDADD = ../3d/lib3d.a ../2d/lib2d.a ../mem/libmem.a ../cfile/libcfile.a ../iff/libiff.a ../texmap/libtexmap.a ../misc/libmisc.a ../maths/libmaths.a ../video/libvideo.a ../arch/libarch.a ../sound/libsound.a ../input/libinput.a
+
+d2x_sdl_LDADD = ${d2x_LDADD} -lm -ldl -lpthread ${SDL_LIBS}
+d2x_ogl_LDADD = ${d2x_sdl_LDADD} ${OGL_LIBS}
+d2x_svga_LDADD = ${d2x_sdl_LDADD} ${SVGA_LIBS}
+d2x_ggi_LDADD = ${d2x_sdl_LDADD} ${GGI_LIBS}
 
 d2x_SOURCES = \
 ai.c	    gamerend.c  lighting.c	paging.c    switch.c \
@@ -19,28 +32,10 @@ credits.c   gamemine.c	kmatrix.c   newmenu.c	songs.c \
 crypt.c     gamepal.c	laser.c     object.c	state.c \
 console.c   cmd.c
 
-
-d2x_LDFLAGS = -export-dynamic
-
-if ENV_DJGPP
- d2x_LDADD = ../3d/lib3d.a ../2d/lib2d.a ../mem/libmem.a ../cfile/libcfile.a ../iff/libiff.a ../texmap/libtexmap.a ../misc/libmisc.a ../maths/libmaths.a  ../video/libvideo.a ../arch/libarch.a ../sound/libsound.a ../input/libinput.a
-
-else
- d2x_LDADD = ../3d/lib3d.a ../2d/lib2d.a ../mem/libmem.a ../cfile/libcfile.a ../iff/libiff.a ../texmap/libtexmap.a ../misc/libmisc.a ../maths/libmaths.a ../arch/libarch.a ../video/libvideo.a ../sound/libsound.a ../input/libinput.a -lm -ldl -lpthread ${SDL_LIBS}
-
-if USE_OPENGL
- d2x_LDADD += ${OGL_LIBS}
-endif
-
-if USE_SVGALIB
- d2x_LDADD += ${SVGA_LIBS}
-endif
-
-if USE_GGI
- d2x_LDADD += ${GGI_LIBS}
-endif
-
-endif
+d2x_sdl_SOURCES = ${d2x_SOURCES}
+d2x_ogl_SOURCES = ${d2x_SOURCES}
+d2x_svga_SOURCES = ${d2x_SOURCES}
+d2x_ggi_SOURCES = ${d2x_SOURCES}
 
 EXTRA_DIST = \
 descent.cfg inferno.ini \
-- 
2.39.2