make qwaq build as part of the main tree (but /not/ install)

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

tools/Makefile.am

@@ -1 +1 @@
-SUBDIRS=pak qfcc qfprogs
+SUBDIRS=pak qfcc qfprogs qwaq

tools/qwaq/.gitignore

@@ -1,12 +1,9 @@
-*.d
 *.dat
-*.la
-*.lo
+*.src
 *.sym
 .deps
 .libs
 .vimrc
 Makefile
 Makefile.in
-progdefs.h
 qwaq

tools/qwaq/Makefile

@@ -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)

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

tools/qwaq/progs.src

@@ -1,7 +0,0 @@
-qwaq.dat
-
-defs.qc
-
-../../cs-code/object.r
-test.r
-main.qc

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