From f3b6485f60f25a30cf708ca374a7302074bc27c4 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Fri, 28 Jun 2002 06:21:17 +0000
Subject: [PATCH] More build stuff.

---
 Makefile.am.newautomake |  6 ++----
 configure.in            | 12 +-----------
 platform/Makefile.am    | 14 ++++++++++++--
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/Makefile.am.newautomake b/Makefile.am.newautomake
index 91e456a5..970be7eb 100644
--- a/Makefile.am.newautomake
+++ b/Makefile.am.newautomake
@@ -6,9 +6,6 @@ libphysfsinclude_HEADERS =	\
 
 if BUILD_MACOSX
 
-BEOS_SRC = @BUILD_BEOS_CPP@
-BEOS_EXTRADIST = @BUILD_BEOS_EXTRA@
-
 ZLIB_FILES = zlib114/adler32.c		\
              zlib114/compress.c		\
              zlib114/crc32.c		\
@@ -56,7 +53,7 @@ libphysfs_la_SOURCES =	\
 	archivers/unzip.h   \
 	platform/unix.c     \
 	platform/posix.c    \
-    $(ZLIB_SRC) $(BEOS_SRC)
+    $(ZLIB_SRC)
 
 libphysfs_la_INCLUDES = $(ZLIB_INC)
 
@@ -89,6 +86,7 @@ EXTRA_DIST =	\
 	platform/skeleton.c    \
 	platform/macclassic.c  \
 	platform/win32.c       \
+	platform/beos.cpp      \
     extras/physfsrwops.h   \
     extras/physfsrwops.c   \
     extras/physfshttpd.c   \
diff --git a/configure.in b/configure.in
index 82a4ab0d..49a885dc 100644
--- a/configure.in
+++ b/configure.in
@@ -236,17 +236,7 @@ dnl Add Makefile conditionals
 AM_CONDITIONAL(BUILD_ZLIB, test x$enable_internal_zlib = xyes)
 AM_CONDITIONAL(BUILD_TEST_PHYSFS, test x$enable_testprog = xyes)
 AM_CONDITIONAL(BUILD_MACOSX, test x$this_is_macosx = xyes)
-
-if test x$this_is_beos = xyes; then
-  BUILD_BEOS_CPP=beos.cpp
-  BUILD_BEOS_EXTRA=
-else
-  BUILD_BEOS_CPP=
-  BUILD_BEOS_EXTRA=beos.cpp
-fi
-
-AC_SUBST([BUILD_BEOS_CPP])
-AC_SUBST([BUILD_BEOS_EXTRA])
+AM_CONDITIONAL(BUILD_BEOS, test x$this_is_beos = xyes)
 
 LDFLAGS="$LDFLAGS -no-undefined"
 
diff --git a/platform/Makefile.am b/platform/Makefile.am
index 8ef0f490..1b1a5a0f 100644
--- a/platform/Makefile.am
+++ b/platform/Makefile.am
@@ -2,8 +2,18 @@ noinst_LTLIBRARIES = libplatform.la
 
 INCLUDES = -I$(top_srcdir)
 
-BEOS_SRC = @BUILD_BEOS_CPP@
-BEOS_EXTRADIST = @BUILD_BEOS_EXTRA@
+if BUILD_BEOS
+BEOS_SRC = beos.cpp
+else
+BEOS_SRC =
+endif
+
+if BUILD_BEOS
+BEOS_EXTRADIST =
+else
+BEOS_EXTRADIST = beos.cpp
+endif
+
 
 libplatform_la_SOURCES =	\
 	unix.c                  \