From 3af96782dafb74271e3d9d4b60c451a0592391ff Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 31 May 2002 06:55:35 +0000
Subject: [PATCH] make qwaq build as part of the main tree (but /not/ install)

---
 configure.ac            |  2 ++
 tools/Makefile.am       |  2 +-
 tools/qwaq/.gitignore   |  5 +----
 tools/qwaq/Makefile     | 30 ------------------------------
 tools/qwaq/Makefile.am  | 23 +++++++++++++++++++++++
 tools/qwaq/progs.src    |  7 -------
 tools/qwaq/progs.src.in |  7 +++++++
 7 files changed, 34 insertions(+), 42 deletions(-)
 delete mode 100644 tools/qwaq/Makefile
 create mode 100644 tools/qwaq/Makefile.am
 delete mode 100644 tools/qwaq/progs.src
 create mode 100644 tools/qwaq/progs.src.in

diff --git a/configure.ac b/configure.ac
index 048ea573a..4858662ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1950,6 +1950,8 @@ AC_OUTPUT(
 	tools/qfprogs/Makefile
 	tools/qfprogs/include/Makefile
 	tools/qfprogs/source/Makefile
+	tools/qwaq/Makefile
+	tools/qwaq/progs.src
 
 	cs-code/Makefile
 	cs-code/menu.src
diff --git a/tools/Makefile.am b/tools/Makefile.am
index eb5b39489..8d94d4b04 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1 +1 @@
-SUBDIRS=pak qfcc qfprogs
+SUBDIRS=pak qfcc qfprogs qwaq
diff --git a/tools/qwaq/.gitignore b/tools/qwaq/.gitignore
index b8c37a768..9348ec572 100644
--- a/tools/qwaq/.gitignore
+++ b/tools/qwaq/.gitignore
@@ -1,12 +1,9 @@
-*.d
 *.dat
-*.la
-*.lo
+*.src
 *.sym
 .deps
 .libs
 .vimrc
 Makefile
 Makefile.in
-progdefs.h
 qwaq
diff --git a/tools/qwaq/Makefile b/tools/qwaq/Makefile
deleted file mode 100644
index 93c9aedcc..000000000
--- a/tools/qwaq/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-EXE=qwaq
-
-MAKEDEPS=$(CC) -MM $(CPPFLAGS) $< | sed -e 's/$*\.o:*/$*\.o $@:/g' > $@
-
-CFLAGS+=-Wall -Werror -g -O2
-CPPFLAGS+=
-#LDFLAGS=-static
-LIBS=
-vpath %.a
-
-SRC=main.c builtins.c
-
-%.d: %.c
-	$(MAKEDEPS)
-
-OBJ=$(patsubst %,%.o,$(basename $(SRC)))
-DEP=$(patsubst %.o,%.d,$(OBJ))
-
-all: $(EXE) $(EXE).dat
-
-$(EXE): $(OBJ) $(LIBS)
-	$(CC) $(LDFLAGS) -o $@ $^ -lQFgamecode -lQFutil -lz -lm
-
-$(EXE).dat: progs.src *.qc ../../cs-code/object.r *.r
-	qfcc --warn=error --code=debug
-
-clean:
-	rm -f $(EXE) *.o *.d core *.dat *.sym progdefs.h
-
--include $(DEP)
diff --git a/tools/qwaq/Makefile.am b/tools/qwaq/Makefile.am
new file mode 100644
index 000000000..5e5726ef4
--- /dev/null
+++ b/tools/qwaq/Makefile.am
@@ -0,0 +1,23 @@
+QFCC=$(top_builddir)/tools/qfcc/source/qfcc
+QCFLAGS=-g -Werror
+INCLUDES= -I$(top_srcdir)/include
+
+noinst_PROGRAMS=qwaq
+noinst_DATA=qwaq.dat
+
+qwaq_libs= \
+	$(top_builddir)/libs/gamecode/engine/libQFgamecode.la \
+	$(top_builddir)/libs/util/libQFutil.la
+
+qwaq_dat_src= \
+	main.qc $(top_srcdir)/cs-code/object.r test.r
+
+qwaq_SOURCES= main.c builtins.c
+qwaq_LDADD= $(qwaq_libs)
+qwaq_DEPENDENCIES= $(qwaq_libs)
+
+qwaq.dat: progs.src $(qwaq_dat_src)
+	$(QFCC) $(QCFLAGS)
+
+EXTRA_DIST=progs.src
+CLEANFILES= *.dat *.sym
diff --git a/tools/qwaq/progs.src b/tools/qwaq/progs.src
deleted file mode 100644
index 75bbd7b04..000000000
--- a/tools/qwaq/progs.src
+++ /dev/null
@@ -1,7 +0,0 @@
-qwaq.dat
-
-defs.qc
-
-../../cs-code/object.r
-test.r
-main.qc
diff --git a/tools/qwaq/progs.src.in b/tools/qwaq/progs.src.in
new file mode 100644
index 000000000..4ddaabe23
--- /dev/null
+++ b/tools/qwaq/progs.src.in
@@ -0,0 +1,7 @@
+qwaq.dat
+
+@srcdir@/defs.qc
+
+@top_srcdir@/cs-code/object.r
+@srcdir@/test.r
+@srcdir@/main.qc