bugger the dependencies, I want to be able to use this stuff for the menus!

This commit is contained in:
Bill Currie 2002-08-15 19:08:44 +00:00
parent f753dd82ae
commit 75ec07705c
9 changed files with 72 additions and 79 deletions

View File

@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS= foreign
SUBDIRS= RPM debian doc include libs qw nq tools cs-code
SUBDIRS= RPM debian doc include libs qw nq tools cs-code ruamoko
## configure.ac needs to be listed here for older autoconfs
EXTRA_DIST= ChangeLog configure.ac \

View File

@ -1397,6 +1397,10 @@ AC_SUBST(ASFLAGS)
AC_SUBST(CCAS)
AC_SUBST(CCASFLAGS)
dnl silence automake about .r files
F77=touch
AC_SUBST(F77)
dnl ==================================================================
dnl Make sure we link against a working zlib
dnl ==================================================================
@ -1994,6 +1998,11 @@ AC_OUTPUT(
cs-code/Makefile
ruamoko/Makefile
ruamoko/include/Makefile
ruamoko/lib/Makefile
ruamoko/game/Makefile
doc/Makefile
doc/man/Makefile

View File

@ -1,5 +0,0 @@
SUBDIRS=lib game
all clean:
@for subdir in $(SUBDIRS); do ( \
cd $$subdir && $(MAKE) $@ \
) done

1
ruamoko/Makefile.am Normal file
View File

@ -0,0 +1 @@
SUBDIRS= include lib game

View File

@ -1,31 +0,0 @@
QFCC=qfcc
QCFLAGS=-qq -g -Werror
QCPPFLAGS=-I../include
game_source = \
axe.r \
gameent.r \
tempent.r \
world.r
game_obj = $(addsuffix .qfo,$(basename $(game_source)))
game_dep = $(addprefix .deps/,$(addsuffix .d,$(basename $(game_source))))
%.qfo: %.r
@mkdir -p .deps
@$(QFCC) -q -M $(QCPPFLAGS) -c $< | sed -e 's/\(\.r\)\?\.o\>/.qfo/' > .deps/`basename $@ .qfo`.d
$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
%.qfo: %.qc
$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
all: game.dat
game.dat: $(game_obj) ../lib/libr.pak
$(QFCC) -qq -g -o $@ $(game_obj) -l../lib/libr.pak
clean:
rm -f *.qfo *.dat *.sym *.d
rm -rf .deps
-include $(game_dep)

29
ruamoko/game/Makefile.am Normal file
View File

@ -0,0 +1,29 @@
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS= foreign
#FIXME should qf data be installed somewhere other than id1 that gets
#searched after everything else?
pkgdatadir=@sharepath@/id1
QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
QCFLAGS=-qq -g -Werror
QCPPFLAGS=-I. -I$(srcdir) -I$(top_builddir)/ruamoko/include -I$(top_srcdir)/ruamoko/include
STRIP=$(shell echo `echo -n $(srcdir)/ | sed -e 's/[^/]//g' | wc -c`)
pkgdata_DATA= game.dat
game_src= axe.r gameent.r tempent.r world.r
%.qfo: %.r
$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -p $(STRIP) -c -o $@ $<
%.qfo: %.qc
$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -p $(STRIP) -c -o $@ $<
game_obj=$(addsuffix .qfo,$(basename $(game_src)))
game.dat: $(game_obj) ../lib/libr.a
$(QFCC) $(QCFLAGS) -p $(STRIP) -o game.dat $(game_obj) -l../lib/libr.a
EXTRA_DIST= $(game_src) axe.h gameent.h tempent.h weapon.h world.h
CLEANFILES= *.dat *.sym *.gz *.qfo

View File

@ -0,0 +1,6 @@
AUTOMAKE_OPTIONS = foreign
includedir = $(prefix)/include/QF/ruamoko
include_HEADERS = \
crudefile.h debug.h entity.h infokey.h math.h message.h nq_message.h \
object.h physics.h qw_message.h qw_physics.h qw_sys.h sound.h \
string.h system.h

View File

@ -1,42 +0,0 @@
QFCC=qfcc
QCFLAGS=-qq -g -Werror
QCPPFLAGS=-I../include
libr_source = \
crudefile.r \
debug.r \
entity.r \
infokey.r \
math.r \
message.r \
nq_message.r \
object.r \
physics.r \
qw_message.r \
qw_physics.r \
qw_sys.r \
sound.r \
string.r \
system.r
libr_obj = $(addsuffix .qfo,$(basename $(libr_source)))
libr_dep = $(addprefix .deps/,$(addsuffix .d,$(basename $(libr_source))))
%.qfo: %.r
@mkdir -p .deps
@$(QFCC) -M -q $(QCPPFLAGS) -c $< | sed -e 's/\(\.r\)\?\.o\>/.qfo/' > .deps/`basename $@ .qfo`.d
$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
%.qfo: %.qc
$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
all: libr.pak
libr.pak: $(libr_obj)
pak -cf $@ $^
clean:
rm -f *.qfo *.pak *.d
rm -rf .deps
-include $(libr_dep)

26
ruamoko/lib/Makefile.am Normal file
View File

@ -0,0 +1,26 @@
AUTOMAKE_OPTIONS= foreign
QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
QCFLAGS=-qq -g -Werror
QCPPFLAGS=$(INCLUDES)
PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
RANLIB=touch
INCLUDES= -I$(top_srcdir)/ruamoko/include
noinst_LIBRARIES= libr.a
%.qfo: %.r
$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -p $(STRIP) -c -o $@ $<
%.o: %.r
$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -p $(STRIP) -c -o $@ $<
libr_a_SOURCES=\
crudefile.r debug.r entity.r infokey.r math.r message.r nq_message.r \
object.r physics.r qw_message.r qw_physics.r qw_sys.r sound.r \
string.r system.r
libr_a_AR=$(PAK) -cf
CLEANFILES = *.qfo