From d95b7d92b55fff9154bd7883506abfbe0f3c16f6 Mon Sep 17 00:00:00 2001
From: Daniel Collins <solemnwarning@solemnwarning.net>
Date: Fri, 30 Nov 2012 21:01:32 +0000
Subject: [PATCH] Replaced BIN_FILES/SRC_FILES variables in Makefile with
 external manifest files and updated for current tree.

---
 Makefile         | 15 ++++---------
 manifest.bin.txt | 12 ++++++++++
 manifest.src.txt | 57 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 11 deletions(-)
 create mode 100644 manifest.bin.txt
 create mode 100644 manifest.src.txt

diff --git a/Makefile b/Makefile
index 75458b8..1dae134 100644
--- a/Makefile
+++ b/Makefile
@@ -30,22 +30,14 @@ export CFLAGS
 export CXX
 export CXXFLAGS
 
-VERSION := DEVELOPMENT BUILD
+VERSION := git
 
 IPXWRAPPER_DEPS := src/ipxwrapper.o src/winsock.o src/ipxwrapper_stubs.o src/log.o src/common.o \
 	src/interface.o src/router.o src/ipxwrapper.def src/addrcache.o src/config.o src/addr.o \
 	src/addrtable.o
 
-BIN_FILES := changes.txt license.txt readme.txt ipxwrapper.dll mswsock.dll wsock32.dll ipxconfig.exe \
-	ipxrouter.exe dpwsockx.dll directplay-win32.reg directplay-win64.reg
-SRC_FILES := changes.txt license.txt Makefile mkstubs.pl readme.txt src/config.h src/ipxconfig.cpp \
-	src/ipxwrapper.c src/ipxwrapper.def src/ipxwrapper.h src/ipxwrapper_stubs.txt src/log.c \
-	src/mswsock.def src/mswsock_stubs.txt src/stubdll.c src/winsock.c src/wsock32.def \
-	src/wsock32_stubs.txt src/directplay.c src/dpwsockx.def src/dpwsockx_stubs.txt src/common.c \
-	src/common.h src/router.c src/router.h src/router-exe.c src/interface.c src/interface.h \
-	icons/ipxrouter.rc icons/ipxrouter.ico icons/ipxconfig.rc icons/ipxconfig.ico \
-	include/dplay.h include/dplaysp.h include/dplobby.h include/wsnwlink.h directplay-win32.reg \
-	directplay-win64.reg
+BIN_FILES := $(shell cat manifest.bin.txt)
+SRC_FILES := $(shell cat manifest.src.txt)
 
 # DLLs to copy to the tests directory before running the test suite.
 
@@ -56,6 +48,7 @@ all: ipxwrapper.dll wsock32.dll mswsock.dll ipxconfig.exe dpwsockx.dll
 clean:
 	rm -f ipxwrapper.dll wsock32.dll mswsock.dll ipxconfig.exe dpwsockx.dll
 	rm -f src/*.o src/*_stubs.s version.o Makefile.dep
+	rm -f tests/*.exe tests/*.o
 
 dist: all
 	mkdir ipxwrapper-$(VERSION)
diff --git a/manifest.bin.txt b/manifest.bin.txt
new file mode 100644
index 0000000..9d88c04
--- /dev/null
+++ b/manifest.bin.txt
@@ -0,0 +1,12 @@
+changes.txt
+license.txt
+readme.txt
+
+ipxwrapper.dll
+mswsock.dll
+wsock32.dll
+dpwsockx.dll
+ipxconfig.exe
+
+directplay-win32.reg
+directplay-win64.reg
diff --git a/manifest.src.txt b/manifest.src.txt
new file mode 100644
index 0000000..4e26e27
--- /dev/null
+++ b/manifest.src.txt
@@ -0,0 +1,57 @@
+changes.txt
+license.txt
+readme.txt
+
+Makefile
+manifest.bin.txt
+manifest.src.txt
+mkdeps.pl
+mkstubs.pl
+
+src/addr.c
+src/addr.h
+src/addrcache.c
+src/addrcache.h
+src/addrtable.c
+src/addrtable.h
+src/common.c
+src/common.h
+src/config.c
+src/config.h
+src/directplay.c
+src/dpwsockx.def
+src/dpwsockx_stubs.txt
+src/interface.c
+src/interface.h
+src/ipxwrapper.c
+src/ipxwrapper.def
+src/ipxwrapper.h
+src/ipxwrapper_stubs.txt
+src/log.c
+src/mswsock.def
+src/mswsock_stubs.txt
+src/router.c
+src/router.h
+src/stubdll.c
+src/winsock.c
+src/wsock32.def
+src/wsock32_stubs.txt
+
+src/ipxconfig.cpp
+icons/ipxconfig.ico
+icons/ipxconfig.rc
+
+include/dplay.h
+include/dplaysp.h
+include/dplobby.h
+include/stdbool.h
+include/uthash.h
+include/utlist.h
+include/wsnwlink.h
+
+directplay-win32.reg
+directplay-win64.reg
+
+tests/bind.c
+tests/bind.pl
+tests/ipxtest.pm