X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=Make.mk;h=4c419dcf943b64a1a7707ab445c48cf4c1da50a1;hp=9449545f4a11ef65651d3c245254bf488a2209b7;hb=refs%2Fheads%2Fhvy-plastic;hpb=db02dda32f6952582bcbf887539e457ac638eade diff --git a/Make.mk b/Make.mk index 9449545f4..4c419dcf9 100644 --- a/Make.mk +++ b/Make.mk @@ -1,35 +1,35 @@ -# +# # Empire - A multi-player, client/server Internet based war game. -# Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak, +# Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak, # Ken Stevens, Steve McClure -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# +# # --- -# +# # See files README, COPYING and CREDITS in the root of the source # tree for related information and legal notices. It is expected # that future projects/authors will amend these files as needed. -# +# # --- -# +# # Make.mk: The real Makefile, included by GNUmakefile -# +# # Known contributors to this file: -# Markus Armbruster, 2005-2007 -# +# Markus Armbruster, 2005-2009 +# # This makefile was inspired by `Recursive Make Considered Harmful', # Peter Miller, 1997. @@ -47,7 +47,7 @@ all: # Source files ifeq ($(revctrl),git) -src := $(shell cd $(srcdir) && git-ls-files) +src := $(shell cd $(srcdir) && git ls-files) else include $(srcdir)/sources.mk endif @@ -88,7 +88,10 @@ subst.in = sed \ # Generated files # See `Cleanliness' below -# sources.mk subjects.mk +mk := subjects.mk +ifeq ($(revctrl),git) +mk += $(srcdir)/sources.mk +endif # Generated by Autoconf, not distributed: ac := config.h config.log config.status info.html info.nr lib stamp-h ac += $(basename $(filter %.in, $(src))) @@ -102,9 +105,9 @@ obj := $(csrc:.c=.o) $(filter %.o, $(ac:.c=.o)) # Dependencies: deps := $(obj:.o=.d) # Library archives: -libs := $(addprefix lib/, libcommon.a libgen.a libglobal.a) +libs := $(addprefix lib/, libcommon.a libas.a libgen.a libglobal.a) # Programs: -util := $(addprefix src/util/, $(addsuffix $(EXEEXT), empsched fairland files pconfig)) +util := $(addprefix src/util/, $(addsuffix $(EXEEXT), empdump empsched fairland files pconfig)) client := src/client/empire$(EXEEXT) server := src/server/emp_server$(EXEEXT) # Info subjects: @@ -115,17 +118,17 @@ info.nr := $(addprefix info.nr/, $(info)) info.html := $(addprefix info.html/, $(addsuffix .html, $(info))) # Conditionally generated files: +empth_obj := src/lib/empthread/io.o +empth_lib := ifeq ($(empthread),LWP) -empth_obj := src/lib/empthread/lwp.o src/lib/empthread/posix.o -empth_lib := lib/liblwp.a +empth_obj += src/lib/empthread/lwp.o src/lib/empthread/posix.o +empth_lib += lib/liblwp.a endif ifeq ($(empthread),POSIX) -empth_obj := src/lib/empthread/pthread.o src/lib/empthread/posix.o -empth_lib := +empth_obj += src/lib/empthread/pthread.o src/lib/empthread/posix.o endif ifeq ($(empthread),Windows) -empth_obj := src/lib/empthread/ntthread.o -empth_lib := +empth_obj += src/lib/empthread/ntthread.o endif ifeq ($(empthread),Windows) # really: W32, regardless of thread package @@ -138,12 +141,10 @@ endif clean := $(obj) $(deps) $(libs) $(util) $(client) $(server) $(tsubj) \ $(ttop) $(info.nr) $(info.html) $(empth_obj) $(empth_lib) # Removed by distclean: -distclean := $(ac) subjects.mk -# Distributed by dist-source from $(srcdir) +distclean := $(ac) $(mk) +# Distributed by dist-source from $(srcdir): src_distgen := $(acdist) -# Distributed by dist-source from . -bld_distgen := sources.mk -# Distributed by dist-client from $(srcdir)/src/client +# Distributed by dist-client from $(srcdir)/src/client; removed by distclean: cli_distgen := $(acdistcli) # Compiler flags @@ -154,8 +155,9 @@ endif ifeq ($(have_gcc),yes) CFLAGS += -fno-builtin-carg # conflicts with our carg() CFLAGS += -fno-common -CFLAGS += -Wall -W -Wno-unused -Wpointer-arith -Wstrict-prototypes \ --Wmissing-prototypes -Wnested-externs -Wredundant-decls +CFLAGS += -Wall -W -Wno-unused-parameter -Wpointer-arith \ +-Wstrict-prototypes -Wmissing-prototypes -Wnested-externs \ +-Wredundant-decls endif LDLIBS += -lm $(client): LDLIBS += $(termlibs) @@ -175,7 +177,7 @@ clean: .PHONY: distclean distclean: clean - rm -rf $(distclean) + rm -rf $(distclean) $(cli_distgen) .PHONY: install install: all installdirs @@ -233,7 +235,12 @@ dist: dist-source dist-client dist-info # addition to %.o. ifeq ($(how_to_dep),fast) %.o: %.c - $(COMPILE.c) -MT $@ -MMD -MP $(OUTPUT_OPTION) $< + $(COMPILE.c) -MT $@ -MMD -MP -MF $(@:.o=.d) $(OUTPUT_OPTION) $< \ + || { rm -f $(@:.o=.d) $@; false; } +# Why the rm? If gcc's preprocessor chokes, it leaves an empty +# dependency file behind, and doesn't touch the object file. If an +# old object file exists, and is newer than the .c file, make will +# then consider the object file up-to-date. endif ifeq ($(how_to_dep),depcomp) %.o: %.c @@ -262,7 +269,7 @@ info.html/%.html: info/%.t # Compilation -$(server): $(filter src/server/% src/lib/as/% src/lib/commands/% src/lib/player/% src/lib/subs/% src/lib/update/%, $(obj)) $(empth_obj) $(libs) $(empth_lib) +$(server): $(filter src/server/% src/lib/commands/% src/lib/player/% src/lib/subs/% src/lib/update/%, $(obj)) $(empth_obj) $(empth_lib) $(libs) $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@ $(client): $(filter src/client/%, $(obj)) src/lib/global/version.o @@ -273,6 +280,7 @@ endif $(util): $(libs) +lib/libas.a: $(filter src/lib/as/%, $(obj)) lib/libcommon.a: $(filter src/lib/common/%, $(obj)) lib/libgen.a: $(filter src/lib/gen/%, $(obj)) lib/libglobal.a: $(filter src/lib/global/%, $(obj)) @@ -312,27 +320,14 @@ $(topics.html): info/emp2html.pl info.ps: info/TROFF.MAC info/INFO.MAC $(ttop) $(tsubj) $(tsrc) groff $^ >$@ -# List of source files - -# Note: $(srcdir)/sources.mk is only used when the source tree came -# from a tarball rather than git. The following rules create a -# sources.mk to put into the tarball. It is not used in this build. - -ifeq ($(revctrl),git) -sources.mk: - echo "src := $(src)" >sources.mk -else -ifneq ($(srcdir),.) -sources.mk: $(srcdir)/sources.mk - cp -f $^ $@ -endif -endif - # Distributing .PHONY: dist-source -dist-source: $(src_distgen) $(bld_distgen) - $(tarball) $(TARNAME)-$(VERSION) $(bld_distgen) -C $(srcdir) $(src_distgen) $(src) +dist-source: $(src_distgen) +ifeq ($(revctrl),git) + echo "src := $(src)" >$(srcdir)/sources.mk +endif + $(tarball) $(TARNAME)-$(VERSION) -C $(srcdir) $(src_distgen) $(src) sources.mk .PHONY: dist-client dist-client: $(cli_distgen)