From f9528a8a9c69311801156a5c4f9cda5ea03eecc8 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Fri, 19 Oct 2001 07:47:38 +0000
Subject: [PATCH] Brought linux networking in line with d1x, moved some
 arch/linux_* stuff to arch/linux/

---
 arch/linux/Makefile.am | 24 ++++++++++++++++++++++++
 main/Makefile.am       |  8 ++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 arch/linux/Makefile.am

diff --git a/arch/linux/Makefile.am b/arch/linux/Makefile.am
new file mode 100644
index 00000000..c8a44fc9
--- /dev/null
+++ b/arch/linux/Makefile.am
@@ -0,0 +1,24 @@
+EXTRA_SUBDIRS = include
+
+noinst_LIBRARIES = libarch_linux.a
+
+INCLUDES = -I$(top_srcdir)/includes -I$(top_srcdir)/main -I$(srcdir)/include
+
+if USE_NETWORK
+libarch_linux_a_SOURCES = findfile.c ipx_bsd.c ipx_kali.c ipx_lin.c linuxnet.c ukali.c
+else
+libarch_linux_a_SOURCES = findfile.c
+endif
+
+EXTRA_libarch_linux_a_SOURCES = \
+ipx_bsd.c ipx_kali.c ipx_lin.c linuxnet.c ukali.c
+
+EXTRA_DIST = \
+alsadigi.c  hmistub.c    serial.c  ukali.c \
+hmiplay.c   mono.c      timer.c
+
+dist-hook:
+	list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \
+	 ( cd $(srcdir) && tar --exclude=CVS -cf - $$subdir ) \
+	  | ( cd $(distdir) && tar xf - ) \
+	done
diff --git a/main/Makefile.am b/main/Makefile.am
index 194e2484..f802a68d 100644
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -10,10 +10,14 @@ EXTRA_PROGRAMS = d2x d2x-sdl d2x-ogl d2x-svga d2x-ggi
 
 LDFLAGS = -export-dynamic
 
+if ENV_DJGPP
+ARCH_LIBS =
+else
 if MINGW32
 ARCH_LIBS = ../arch/win32/libarch_win32.a
 else
-ARCH_LIBS =
+ARCH_LIBS = ../arch/linux/libarch_linux.a
+endif
 endif
 
 d2x_LDADD = ${ARCH_LIBS} ../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
@@ -70,7 +74,7 @@ newmenu.h object.h paging.h physics.h piggy.h player.h playsave.h polyobj.h \
 powerup.h render.h robot.h scores.h screens.h segment.h segpoint.h slew.h \
 songs.h sounds.h state.h switch.h terrain.h texmerge.h text.h textures.h \
 titles.h vclip.h vers_id.h wall.h weapon.h \
-dumpmine.c ipx_drv.h
+dumpmine.c ipx_drv.c
 
 dist-hook:
 	list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \
-- 
2.39.2