X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=Make.mk;h=545eb0b5a0d455b9508a57b693fb6dd31915cb6f;hp=6fdf2e988cd2e7beb5028462b9aefd90f3f0bf88;hb=refs%2Fheads%2Fhvy-plastic-3;hpb=f915f91b4788c9a39ce01ef073f61075bac22129 diff --git a/Make.mk b/Make.mk index 6fdf2e988..545eb0b5a 100644 --- a/Make.mk +++ b/Make.mk @@ -1,39 +1,38 @@ -# +# # Empire - A multi-player, client/server Internet based war game. -# Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak, -# Ken Stevens, Steve McClure -# -# This program is free software; you can redistribute it and/or modify +# Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak, +# Ken Stevens, Steve McClure, Markus Armbruster +# +# Empire 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 +# the Free Software Foundation, either version 3 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 -# +# along with this program. If not, see . +# # --- -# +# # 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: -# +# +# Make.mk: The real Makefile, included by GNUmakefile +# # Known contributors to this file: -# Markus Armbruster, 2005-2007 -# +# Markus Armbruster, 2005-2011 +# # This makefile was inspired by `Recursive Make Considered Harmful', # Peter Miller, 1997. -# http://www.pcug.org.au/~millerp/rmch/recu-make-cons-harm.html +# http://miller.emu.id.au/pmiller/books/rmch/ # Recursively expanded variables are occasionally useful, but can be # slow and tricky. Do not use them gratuitously. If you don't @@ -46,14 +45,18 @@ all: .DELETE_ON_ERROR: # Source files --include sources.mk +ifeq ($(revctrl),git) +src := $(shell cd $(srcdir) && git ls-files) +else +include $(srcdir)/sources.mk +endif dirs := $(sort $(dir $(src))) csrc := $(filter %.c, $(src)) tsrc := $(filter %.t, $(src)) man6 := $(filter man/%.6, $(src)) builtins := $(filter src/lib/global/%.config, $(src)) -# Info topics and subjects +# Info subjects (automatically generated) -include subjects.mk # Abbreviations @@ -63,18 +66,33 @@ subjects.html := $(addprefix info.html/, $(addsuffix .html, $(subjects))) topics.html := $(addprefix info.html/, $(addsuffix .html, $(topics))) scripts := $(srcdir)/src/scripts depcomp := $(SHELL) $(srcdir)/depcomp -tarball := $(SHELL) $(scripts)/tarball +tarball := $(SHELL) -e $(scripts)/tarball econfig := $(sysconfdir)/empire/econfig schedule := $(sysconfdir)/empire/schedule gamedir := $(localstatedir)/empire builtindir := $(datadir)/empire/builtin einfodir := $(datadir)/empire/info.nr ehtmldir := $(datadir)/empire/info.html +client/w32 := arpa/inet.h netdb.h netinet/in.h sys/time.h sys/socket.h \ +sys/uio.h unistd.h w32io.c w32sockets.c w32types.h + +# Abbreviate make output +# Run make with a V=1 parameter for full output. +ifneq ($(origin V),command line) +V:= +endif +# $(call quiet-command COMMAND,ABBREV) runs COMMAND, but prints only ABBREV. +# Recursively expanded so that variables in COMMAND and ABBREV work. +ifneq ($V$(findstring s,$(MAKEFLAGS)),) +quiet-command = $1 +else +quiet-command = @echo $2 && $1 +endif # How to substitute Autoconf output variables # Recursively expanded so that $@ and $< work. subst.in = sed \ - -e 's?@configure_input\@?$(notdir $@). Generated from $(notdir $<) by GNUmakefile.?g' \ + -e 's?@configure_input\@?$(notdir $@): Generated from $(notdir $<) by make.?g' \ -e 's?@builtindir\@?$(builtindir)?g' \ -e 's?@econfig\@?$(econfig)?g' \ -e 's?@einfodir\@?$(einfodir)?g' \ @@ -84,7 +102,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))) @@ -95,13 +116,12 @@ acdist := aclocal.m4 config.h.in configure stamp-h.in acdistcli := $(addprefix src/client/, aclocal.m4 config.h.in configure) # Object files: obj := $(csrc:.c=.o) $(filter %.o, $(ac:.c=.o)) -# TODO AIX needs lwpInit.o lwpRestore.o lwpSave.o unless UCONTEXT # Dependencies: deps := $(obj:.o=.d) # Library archives: libs := $(addprefix lib/, libcommon.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: @@ -110,45 +130,53 @@ ttop := info/TOP.t # Formatted info: info.nr := $(addprefix info.nr/, $(info)) info.html := $(addprefix info.html/, $(addsuffix .html, $(info))) +info.all := $(info.nr) $(info.html) info.ps # 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 +libs += lib/libw32.a +$(client): lib/libw32.a endif # Cleanliness # Each generated file should be in one of the following sets. # Removed by clean: clean := $(obj) $(deps) $(libs) $(util) $(client) $(server) $(tsubj) \ -$(ttop) $(info.nr) $(info.html) $(empth_obj) $(empth_lib) +$(ttop) $(info.all) $(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 CPPFLAGS += -I$(srcdir)/include -I. +ifeq ($(empthread),Windows) # really: W32, regardless of thread package +CPPFLAGS += -I$(srcdir)/src/lib/w32 +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) +$(client): LDLIBS := $(LIBS_client) +$(server): LDLIBS := $(LIBS_server) ### Advertized goals @@ -161,11 +189,11 @@ html: $(info.html) .PHONY: clean clean: - rm -f $(clean) + $(call quiet-command,rm -f $(clean),CLEAN) .PHONY: distclean distclean: clean - rm -rf $(distclean) + $(call quiet-command,rm -rf $(distclean) $(cli_distgen),DISTCLEAN) .PHONY: install install: all installdirs @@ -179,8 +207,10 @@ install: all installdirs echo 'every 10 minutes' >>$(schedule).dist [ -e $(schedule) ] || mv $(schedule).dist $(schedule) if [ -e $(econfig) ]; then \ + echo "Attempting to update your econfig"; \ if src/util/pconfig $(econfig) >$(econfig).dist; then \ if cmp -s $(econfig) $(econfig).dist; then \ + echo "$(econfig) unchanged"; \ rm $(econfig).dist; \ fi; \ else \ @@ -209,8 +239,7 @@ uninstall: rm -f $(addprefix $(bindir)/, $(notdir $(client))) rm -rf $(builtindir) $(einfodir) rm -f $(addprefix $(mandir)/man6/, $(notdir $(man6))) - @[ -e $(gamedir) ] && echo "$(gamedir) not removed, you may wish to remove it manually." - @[ -e $(econfig) ] && echo "$(econfig) not removed, you may wish to remove it manually." + @echo "$(dir $(econfig)) and $(gamedir) not removed, you may wish to remove it manually." .PHONY: dist dist: dist-source dist-client dist-info @@ -222,26 +251,29 @@ dist: dist-source dist-client dist-info # addition to %.o. ifeq ($(how_to_dep),fast) %.o: %.c - $(COMPILE.c) -MT $@ -MMD -MP $(OUTPUT_OPTION) $< + $(call quiet-command,$(COMPILE.c) -MT $@ -MMD -MP -MF $(@:.o=.d) \ + $(OUTPUT_OPTION) $< || { rm -f $(@:.o=.d) $@; false; },CC $@) +# 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 - source='$<' object='$@' depfile='$(@:.o=.d)' $(CCDEPMODE) $(depcomp) \ - $(COMPILE.c) $(OUTPUT_OPTION) $< + $(call quiet-command,source='$<' object='$@' depfile='$(@:.o=.d)' \ + $(CCDEPMODE) $(depcomp) $(COMPILE.c) $(OUTPUT_OPTION) $<,CC $@) endif # Cancel the rule to compile %.c straight to %, it interferes with # automatic dependency generation %: %.c -# Work around MinGW Make's broken built-in link rule: %$(EXEEXT): %.o - $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@ + $(call quiet-command,$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@,LINK $@) info.nr/%: info/%.t - $(NROFF) $(filter %.MAC, $^) $< | $(AWK) -f $(filter %/Blank.awk, $^) >$@ -# Pipes in make are a pain. Catch obvious errors: - @test -s $@ + $(call quiet-command,$(NROFF) $(filter %.MAC, $^) $< | $(AWK) -f $(filter %/Blank.awk, $^) >$@ && test -s $@,NROFF $@) +# Pipes in make are a pain. The "test -s" catches obvious errors. info.html/%.html: info/%.t perl $(filter %.pl, $^) $< >$@ @@ -251,11 +283,11 @@ 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) - $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@ +$(server): $(filter src/server/% src/lib/commands/% src/lib/player/% src/lib/subs/% src/lib/update/%, $(obj)) $(empth_obj) $(empth_lib) $(libs) + $(call quiet-command,$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@,LINK $@) -$(client): $(filter src/client/%, $(obj)) - $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@ +$(client): $(filter src/client/%, $(obj)) src/lib/global/version.o + $(call quiet-command,$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@,LINK $@) $(util): $(libs) @@ -263,19 +295,19 @@ lib/libcommon.a: $(filter src/lib/common/%, $(obj)) lib/libgen.a: $(filter src/lib/gen/%, $(obj)) lib/libglobal.a: $(filter src/lib/global/%, $(obj)) lib/liblwp.a: $(filter src/lib/lwp/%, $(obj)) +lib/libw32.a: $(filter src/lib/w32/%, $(obj)) $(libs) $(empth_lib): - $(AR) rc $@ $? + $(call quiet-command,$(AR) rc $@ $?,AR $@) $(RANLIB) $@ # Info formatting -subjects.mk: $(tsrc) info/findsubj.pl sources.mk - perl $(srcdir)/info/findsubj.pl -# If sources.mk is out of date, $(tsrc) is. If it contains files that -# went away, make can't remake subjects.mk. Tell it to ignore such -# missing files: -$(tsrc): +# FIXME Remaking subjects doesn't work correctly when info sources get +# removed or subjects get dropped. + +subjects.mk: info/findsubj.pl $(tsrc) + perl $(srcdir)/info/findsubj.pl $(filter %.t, $^) $(tsubj): info/mksubj.pl perl $(srcdir)/info/mksubj.pl $@ $(filter %.t, $^) @@ -284,12 +316,11 @@ $(ttop): $(tsubj) perl $(srcdir)/info/mktop.pl $@ $(filter %.t, $^) info.nr/all: $(filter-out info.nr/all, $(info.nr)) - (cd info.nr && LC_ALL=C ls -C $(info)) >$@ -# FIXME shouldn't use ls + >$@ + (cd info.nr && LC_ALL=C ls -C $(info)) >>$@ -info.html/all.html: $(filter-out info.html/all.html, $(info.html)) info/ls2html.pl - (cd info.html && LC_ALL=C ls -C $(notdir $(info.html))) | expand | perl $(filter %.pl, $^) >$@ -# FIXME shouldn't use ls +info.html/all.html: info.nr/all info/ls2html.pl + expand $< | perl $(srcdir)/info/ls2html.pl >$@ $(info.nr): info/CRT.MAC info/INFO.MAC info/Blank.awk @@ -299,31 +330,23 @@ $(topics.html): info/emp2html.pl info.ps: info/TROFF.MAC info/INFO.MAC $(ttop) $(tsubj) $(tsrc) groff $^ >$@ -# List of source files - -ifeq ($(cvs_controlled),yes) -# Find files and directories under CVS control -sources.mk: $(scripts)/cvsfiles.awk $(addprefix $(srcdir)/, $(addsuffix CVS/Entries, $(dirs))) - echo 'src := ' `cd $(srcdir) && $(AWK) -f src/scripts/cvsfiles.awk | LC_ALL=C sort` >$@ -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) $(tarball) $(TARNAME)-client-$(VERSION) \ -C $(srcdir)/src/client \ $(notdir $(filter src/client/%, $(src)) $(cli_distgen)) \ - -C $(srcdir)/include proto.h \ + -C $(srcdir)/include proto.h version.h \ + -C $(srcdir)/src/lib/global version.c \ + -C $(srcdir)/src/lib $(addprefix w32/, $(client/w32)) \ -C $(srcdir)/man empire.6 \ -C $(srcdir) COPYING INSTALL install-sh @@ -332,6 +355,8 @@ dist-info: info html $(tarball) $(TARNAME)-info-text-$(VERSION) -C info.nr $(info) $(tarball) $(TARNAME)-info-html-$(VERSION) -C info.html $(addsuffix .html, $(info)) +# Dependencies + ifneq ($(deps),) -include $(deps) endif @@ -365,7 +390,7 @@ config.status: configure ./config.status --recheck src/lib/global/path.c src/client/ipglob.c: %: %.in GNUmakefile Make.mk - $(subst.in) <$< >$@ + $(call quiet-command,$(subst.in) <$< >$@,GEN $@) # Make files for standalone client distribution @@ -377,5 +402,5 @@ $(srcdir)/src/client/config.h.in: src/client/configure.ac src/client/aclocal.m4 cd $(dir $@) && autoheader touch $@ -$(srcdir)/src/client/aclocal.m4: m4/lib_socket_nsl.m4 - cp -f $< $@ +$(srcdir)/src/client/aclocal.m4: m4/lib_socket_nsl.m4 m4/my_terminfo.m4 m4/my_windows_api.m4 + cat $^ >$@