From 57d095b72a906ebec76c5e0053a7a1e91a586156 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Wed, 24 Oct 2001 09:30:02 +0000
Subject: [PATCH] Revert bin_programs to earlier style until i understand
 automake 1.5 better. remove input from SUBDIRS

---
 Makefile.am    | 20 ++------------------
 configure.in   | 30 +++++++++++++++++++++---------
 main/kconfig.c |  4 ++--
 3 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 908631f1..fc7eeacf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +1,8 @@
-SUBDIRS = 2d 3d maths mem cfile iff texmap misc input video sound arch main
+SUBDIRS = 2d 3d maths mem cfile iff texmap misc video sound arch main
 
 EXTRA_SUBDIRS = includes tools unused
 
-if ENV_DJGPP
-bin_PROGRAMS = d2x
-else
-if USE_GGI
-bin_PROGRAMS = d2x-ggi
-else
-if USE_SVGALIB
-bin_PROGRAMS = d2x-svga
-else
-if USE_OPENGL
-bin_PROGRAMS = d2x-ogl
-else
-bin_PROGRAMS = d2x-sdl
-endif
-endif
-endif
-endif
+bin_PROGRAMS = @TARGETS@
 
 EXTRA_PROGRAMS = d2x d2x-sdl d2x-ogl d2x-svga d2x-ggi
 
diff --git a/configure.in b/configure.in
index 1e4f1126..5fedb04f 100644
--- a/configure.in
+++ b/configure.in
@@ -75,18 +75,12 @@ if test "$host_os" = "msdosdjgpp"; then
 
   CFLAGS="-I \$(top_srcdir)/arch/dos/include $CFLAGS"
   AC_PATH_PROG(NASM, nasm, no)
+  TARGETS=d2x
   D2X_ARCH_SUBDIRS=dos
 else
 
   CFLAGS="-pipe $CFLAGS"
 
-  D2X_ARCH_SUBDIRS=sdl
-  if test x$MINGW32 = xyes; then
-    D2X_ARCH_SUBDIRS="win32 ${D2X_ARCH_SUBDIRS}"
-  else
-    D2X_ARCH_SUBDIRS="linux ${D2X_ARCH_SUBDIRS}"
-  fi
-
   dnl Check for SDL
   AM_PATH_SDL(1.1.7,
     :,
@@ -96,6 +90,9 @@ else
 
   CFLAGS="$SDL_CFLAGS $CFLAGS"
 
+  TARGETS=d2x-sdl
+  D2X_ARCH_SUBDIRS=sdl
+
   AC_CHECK_HEADERS(netipx/ipx.h)
 
   # Check for OpenGL
@@ -111,6 +108,7 @@ else
 	)
     done
     AC_DEFINE(OGL)
+    TARGETS=d2x-ogl
   fi
   AC_SUBST(OGL_LIBS)
   AM_CONDITIONAL(USE_OPENGL, test x$with_opengl = xyes)
@@ -126,9 +124,11 @@ else
       GGI_LIBS="${GGI_LIBS} -lgii",
       [AC_MSG_ERROR([GII not found, GGI version cannot be built]); ggi=false])
     AC_DEFINE(GGI)
+    TARGETS=d2x-ggi
+    D2X_ARCH_SUBDIRS = "${D2X_ARCH_SUBDIRS} ggi"
   fi
   AC_SUBST(GGI_LIBS)
-  AM_CONDITIONAL(USE_GGI, test x$with_ggi = xtrue)
+  AM_CONDITIONAL(USE_GGI, test x$with_ggi = xyes)
 
   # Check for SVGALib
   AC_ARG_WITH(svga,
@@ -145,10 +145,19 @@ else
        svga=false],
        -lvga)
     AC_DEFINE(SVGA)
+    TARGETS=d2x-svga
+    D2X_ARCH_SUBDIRS = "${D2X_ARCH_SUBDIRS} svgalib"
   fi
   AC_SUBST(SVGA_LIBS)
   AM_CONDITIONAL(USE_SVGALIB, test x$with_svga = yes)
 
+  if test x$MINGW32 = xyes; then
+    D2X_ARCH_SUBDIRS="${D2X_ARCH_SUBDIRS} win32"
+  else
+    CFLAGS="-I \$(top_srcdir)/arch/linux/include $CFLAGS"
+    D2X_ARCH_SUBDIRS="${D2X_ARCH_SUBDIRS} linux"
+  fi
+
   AC_PATH_PROG(NASM, $NASM_PROG, no)
 fi
 
@@ -189,6 +198,8 @@ AM_CONDITIONAL(USE_ASM, test x$enable_assembler != xno)
 
 AC_SUBST(D2X_ARCH_SUBDIRS)
 
+AC_SUBST(TARGETS)
+
 AC_SUBST(NASMFLAGS)
 
 AC_SUBST(CFLAGS)
@@ -199,12 +210,13 @@ Makefile
 3d/Makefile
 arch/Makefile
 arch/dos/Makefile
+arch/ggi/Makefile
 arch/linux/Makefile
 arch/sdl/Makefile
+arch/svgalib/Makefile
 arch/win32/Makefile
 cfile/Makefile
 iff/Makefile
-input/Makefile
 main/Makefile
 maths/Makefile
 mem/Makefile
diff --git a/main/kconfig.c b/main/kconfig.c
index f1f4dd1b..230e3268 100644
--- a/main/kconfig.c
+++ b/main/kconfig.c
@@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: kconfig.c,v 1.9 2001-10-18 23:59:22 bradleyb Exp $";
+static char rcsid[] = "$Id: kconfig.c,v 1.10 2001-10-24 09:30:02 bradleyb Exp $";
 #endif
 
 #ifdef WINDOWS
@@ -72,7 +72,7 @@ static char rcsid[] = "$Id: kconfig.c,v 1.9 2001-10-18 23:59:22 bradleyb Exp $";
 #include "collide.h"
 
 #ifdef __linux__
-#include "linux_joystick.h"
+#include "joystick.h"
 #endif
 
 ubyte ExtGameStatus=1;
-- 
2.39.2