[PATCH] Add automatic dependency generation This is a first pass at getting automatic file dependencies generated. We use gcc's -M options to have it generate the makefile rules for each object file. The rule for and object file OBJ is stored in the file .OBJ.d. The dependecy file is automatically updated whenever the object file gets updated. I think this can be cleaned up quite a bit (there seems to be a lot of redundancy in there), but it's working right now and I want to get something committed. diff -urN a/Makefile head/Makefile --- a/Makefile 2006-03-14 17:06:26.000000000 +1030 +++ head/Makefile 2006-03-14 17:00:27.000000000 +1030 @@ -1,14 +1,23 @@ # -# A Makefile to run under MinGW on Win32 +# TyrQuake Makefile (tested under Linux and MinGW/Msys) # -# Pretty crappy, but you can build all the targets if you clean in -# between. It's needed because various -DXXX flags change the object files and -# I'm still working on doing it properly... but slowly. +# By default, all executables will be built. If you want to just build one, +# just type e.g. "make tyr-quake". If the build dirs haven't been created yet, +# you might need to type "make prepare" first. +# +# Options: +# -------- +# To build an executable with debugging symbols, un-comment the DEBUG=Y option +# below. You should "make clean" when switching this option on or off. +# +# To build an executable without using any of the hand written x86 assembler, +# un-comment the NO_X86_ASM option below. You should "make clean" when +# switching this option on or off. # TYR_VERSION_MAJOR = 0 TYR_VERSION_MINOR = 52 TYR_VERSION_BUILD = TYR_VERSION = $(TYR_VERSION_MAJOR).$(TYR_VERSION_MINOR)$(TYR_VERSION_BUILD) @@ -163,14 +172,37 @@ QWSV_CPPFLAGS += -DELF endif -cmd_nqsw_cc = $(CC) -c $(NQSW_CPPFLAGS) $(CFLAGS) -o $@ $< -cmd_nqgl_cc = $(CC) -c $(NQGL_CPPFLAGS) $(CFLAGS) -o $@ $< -cmd_qwsw_cc = $(CC) -c $(QWSW_CPPFLAGS) $(CFLAGS) -o $@ $< -cmd_qwgl_cc = $(CC) -c $(QWGL_CPPFLAGS) $(CFLAGS) -o $@ $< -cmd_qwsv_cc = $(CC) -c $(QWSV_CPPFLAGS) $(CFLAGS) -o $@ $< - -cmd_nq_windres = windres -I NQ -i $< -O coff -o $@ -cmd_qw_windres = windres -I QW/client -i $< -O coff -o $@ +define cmd_cc__ +$(CC) -MM -MT $@ $($(1)) -o $(2)/.$(@F).d $< +$(CC) -c $($(1)) $(CFLAGS) -o $@ $< +endef + +DEPFILES = \ + $(wildcard $(BUILD_DIR)/nqsw/.*.d) \ + $(wildcard $(BUILD_DIR)/nqgl/.*.d) \ + $(wildcard $(BUILD_DIR)/qwsw/.*.d) \ + $(wildcard $(BUILD_DIR)/qwgl/.*.d) \ + $(wildcard $(BUILD_DIR)/qwsv/.*.d) + +ifneq ($(DEPFILES),) +-include $(DEPFILES) +endif + +cmd_nqsw_cc = $(call cmd_cc__,NQSW_CPPFLAGS,$(BUILD_DIR)/nqsw) +cmd_nqgl_cc = $(call cmd_cc__,NQGL_CPPFLAGS,$(BUILD_DIR)/nqgl) +cmd_qwsw_cc = $(call cmd_cc__,QWSW_CPPFLAGS,$(BUILD_DIR)/qwsw) +cmd_qwgl_cc = $(call cmd_cc__,QWGL_CPPFLAGS,$(BUILD_DIR)/qwgl) +cmd_qwsv_cc = $(call cmd_cc__,QWSV_CPPFLAGS,$(BUILD_DIR)/qwsv) + +define cmd_windres__ +$(CC) -x c-header -MM -MT $@ $($(1)) -o $(2)/.$(@F).d $< +windres -I $(