X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=Make.mk;h=19988c012ec1e6ae6ee50e80d57fea11e49639d5;hp=2081b65439b1a0bc445cd3e2468bfaf54753f534;hb=HEAD;hpb=b4ecf7c7a6288b08abf6990bd67cdf22dcfae56f diff --git a/Make.mk b/Make.mk index 2081b6543..19988c012 100644 --- a/Make.mk +++ b/Make.mk @@ -1,11 +1,11 @@ # # Empire - A multi-player, client/server Internet based war game. -# Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak, -# Ken Stevens, Steve McClure +# Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak, +# Ken Stevens, Steve McClure, Markus Armbruster # -# This program is free software; you can redistribute it and/or modify +# 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, @@ -14,8 +14,7 @@ # 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 . # # --- # @@ -28,12 +27,12 @@ # Make.mk: The real Makefile, included by GNUmakefile # # Known contributors to this file: -# Markus Armbruster, 2005-2008 +# Markus Armbruster, 2005-2020 # # 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 @@ -47,9 +46,18 @@ all: # Source files ifeq ($(revctrl),git) -src := $(shell cd $(srcdir) && git ls-files) +src := $(shell cd $(srcdir) && git ls-files | uniq) +version := $(shell cd $(srcdir) && build-aux/git-version-gen /dev/null) +ifeq ($(version),UNKNOWN) +$(warning cannot figure out version number, falling back to git hash) +version := UNKNOWN-$(shell cd $(srcdir) && git-rev-parse --verify --short HEAD || echo "UNKNOWN") +endif else include $(srcdir)/sources.mk +version := $(shell cat $(srcdir)/.tarball-version || echo "UNKNOWN") +endif +ifeq ($(version),UNKNOWN) +$(error cannot figure out version number) endif dirs := $(sort $(dir $(src))) csrc := $(filter %.c, $(src)) @@ -57,23 +65,42 @@ tsrc := $(filter %.t, $(src)) man6 := $(filter man/%.6, $(src)) builtins := $(filter src/lib/global/%.config, $(src)) -# Info subjects (automatically generated) --include subjects.mk +# Info subjects +include $(srcdir)/info/subjects.mk # Abbreviations topics := $(patsubst %.t,%,$(notdir $(tsrc))) info := $(topics) $(subjects) all TOP -subjects.html := $(addprefix info.html/, $(addsuffix .html, $(subjects))) -topics.html := $(addprefix info.html/, $(addsuffix .html, $(topics))) scripts := $(srcdir)/src/scripts -depcomp := $(SHELL) $(srcdir)/depcomp +depcomp := $(SHELL) $(srcdir)/build-aux/depcomp 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 +edatadir := $(datadir)/empire +builtindir := $(edatadir)/builtin +einfodir := $(edatadir)/info.nr +ehtmldir := $(edatadir)/info.html +client/w32 := arpa/inet.h getopt.c 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 + +# Helper for running tests +# Usage: $(call run-test, SHELL-SCRIPT) +# Recursively expanded, or else parameters don't work +run-test = $(call quiet-command, $(SHELL) -e $1 $(srcdir), TEST $1) # How to substitute Autoconf output variables # Recursively expanded so that $@ and $< work. @@ -88,38 +115,32 @@ subst.in = sed \ # Generated files # See `Cleanliness' below -mk := subjects.mk -ifeq ($(revctrl),git) -mk += sources.mk -else -ifneq ($(srcdir),.) -mk += sources.mk -endif -endif +# Generated makefiles, distributed by dist-source from $(srcdir): +mk := sources.mk # Generated by Autoconf, not distributed: ac := config.h config.log config.status info.html info.nr lib stamp-h ac += $(basename $(filter %.in, $(src))) ac += $(srcdir)/autom4te.cache $(srcdir)/src/client/autom4te.cache # distributed by dist-source from $(srcdir): acdist := aclocal.m4 config.h.in configure stamp-h.in -# distributed by dist-client from $(srcdir): -acdistcli := $(addprefix src/client/, aclocal.m4 config.h.in configure) # Object files: obj := $(csrc:.c=.o) $(filter %.o, $(ac:.c=.o)) # Dependencies: deps := $(obj:.o=.d) # Library archives: -libs := $(addprefix lib/, libcommon.a libas.a libgen.a libglobal.a) +libs := $(addprefix lib/, libcommon.a libgen.a libglobal.a) # Programs: util := $(addprefix src/util/, $(addsuffix $(EXEEXT), empdump empsched fairland files pconfig)) client := src/client/empire$(EXEEXT) server := src/server/emp_server$(EXEEXT) # Info subjects: tsubj := $(addprefix info/, $(addsuffix .t, $(subjects))) -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 info/stamp-subj +# Tests +# sandbox # Conditionally generated files: empth_obj := src/lib/empthread/io.o @@ -137,36 +158,30 @@ 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) +info/toc info/TOP.t $(info.all) $(empth_obj) $(empth_lib) sandbox # Removed by distclean: -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 -cli_distgen := $(acdistcli) +distclean := $(ac) +ifeq ($(revctrl),git) +distclean += $(addprefix $(srcdir)/, $(mk)) +endif +# Distributed by dist-source from $(srcdir): +src_distgen := $(acdist) $(mk) # 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-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 @@ -179,17 +194,18 @@ html: $(info.html) .PHONY: clean clean: - rm -f $(clean) + $(call quiet-command,rm -rf $(clean),CLEAN) .PHONY: distclean distclean: clean - rm -rf $(distclean) + $(call quiet-command,rm -rf $(distclean),DISTCLEAN) .PHONY: install install: all installdirs $(INSTALL_PROGRAM) $(util) $(server) $(sbindir) $(INSTALL_PROGRAM) $(client) $(bindir) $(INSTALL) -m 444 $(addprefix $(srcdir)/, $(builtins)) $(builtindir) + rm -f $(einfodir)/* $(INSTALL_DATA) $(info.nr) $(einfodir) $(INSTALL_DATA) $(addprefix $(srcdir)/, $(man6)) $(mandir)/man6 sed -e '1,/^$$/d' -e 's/^/# /g' <$(srcdir)/doc/schedule >$(schedule).dist @@ -221,19 +237,57 @@ installdirs: .PHONY: install-html install-html: html mkdir -p $(ehtmldir) + rm -f $(ehtmldir)/* $(INSTALL_DATA) $(info.html) $(ehtmldir) .PHONY: uninstall uninstall: rm -f $(addprefix $(sbindir)/, $(notdir $(util) $(server))) rm -f $(addprefix $(bindir)/, $(notdir $(client))) - rm -rf $(builtindir) $(einfodir) + rm -rf $(builtindir) $(einfodir) $(ehtmldir) + rmdir $(edatadir) rm -f $(addprefix $(mandir)/man6/, $(notdir $(man6))) @echo "$(dir $(econfig)) and $(gamedir) not removed, you may wish to remove it manually." .PHONY: dist dist: dist-source dist-client dist-info +.PHONY: check check-accept _check +check check-accept: _check +check: export EMPIRE_CHECK_ACCEPT := +check-accept: export EMPIRE_CHECK_ACCEPT := y +_check: all + @echo "Warning: test suite is immature and needs work." >&2 + $(call run-test, $(srcdir)/tests/files-test) + $(call run-test, $(srcdir)/tests/fairland-test) + $(call run-test, $(srcdir)/tests/info-test) +ifeq ($(empthread),LWP) + $(call run-test, $(srcdir)/tests/smoke-test) + $(call run-test, $(srcdir)/tests/actofgod-test) + $(call run-test, $(srcdir)/tests/build-test) + $(call run-test, $(srcdir)/tests/load-tend-test) + $(call run-test, $(srcdir)/tests/navi-march-test) + $(call run-test, $(srcdir)/tests/fire-test) + $(call run-test, $(srcdir)/tests/torpedo-test) + $(call run-test, $(srcdir)/tests/bridgefall-test) + $(call run-test, $(srcdir)/tests/retreat-test) + $(call run-test, $(srcdir)/tests/update-test) + $(call run-test, $(srcdir)/tests/version-test) +else + @echo "TEST $(srcdir)/tests/smoke-test SKIPPED" + @echo "TEST $(srcdir)/tests/actofgod-test SKIPPED" + @echo "TEST $(srcdir)/tests/build-test SKIPPED" + @echo "TEST $(srcdir)/tests/load-tend-test SKIPPED" + @echo "TEST $(srcdir)/tests/navi-march-test SKIPPED" + @echo "TEST $(srcdir)/tests/fire-test SKIPPED" + @echo "TEST $(srcdir)/tests/torpedo-test SKIPPED" + @echo "TEST $(srcdir)/tests/bridgefall-test SKIPPED" + @echo "TEST $(srcdir)/tests/retreat-test SKIPPED" + @echo "TEST $(srcdir)/tests/update-test SKIPPED" + @echo "TEST $(srcdir)/tests/version-test SKIPPED" +endif + $(call run-test, $(srcdir)/tests/empdump-test) + ### Implicit rules @@ -241,8 +295,8 @@ dist: dist-source dist-client dist-info # addition to %.o. ifeq ($(how_to_dep),fast) %.o: %.c - $(COMPILE.c) -MT $@ -MMD -MP -MF $(@:.o=.d) $(OUTPUT_OPTION) $< \ - || { rm -f $(@:.o=.d) $@; false; } + $(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 @@ -250,25 +304,23 @@ ifeq ($(how_to_dep),fast) 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, $^) $< >$@ + $(call quiet-command,perl $(srcdir)/info/emp2html.pl $(info) <$< >$@,GEN $@) ### Explicit rules @@ -276,17 +328,13 @@ info.html/%.html: info/%.t # Compilation $(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 $@ + $(call quiet-command,$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@,LINK $@) -$(client): $(filter src/client/%, $(obj)) src/lib/global/version.o - $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@ -ifeq ($(empthread),Windows) -$(client): src/lib/w32/getopt.o -endif +$(client): $(filter src/client/%, $(obj)) src/lib/global/version.o src/lib/gen/fnameat.o + $(call quiet-command,$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@,LINK $@) $(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)) @@ -294,22 +342,37 @@ 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 +src/lib/global/version.o: CPPFLAGS += -DVERSION='"$(version)"' +src/lib/global/version.o: $(src) -# FIXME Remaking subjects doesn't work correctly when info sources get -# removed or subjects get dropped. +ifneq ($(revctrl),git) +$(srcdir)/.tarball-version: $(src) + v=`sed -e 's/-dirty$$//' <$@`; echo "$$v-dirty" >$@ +# Force Make to start over after updating .tarball-version, so that +# $(version) gets the new value +$(srcdir)/.dirty-stamp: $(srcdir)/.tarball-version + >$@ +include $(srcdir)/.dirty-stamp +endif -subjects.mk: info/findsubj.pl $(tsrc) - perl $(srcdir)/info/findsubj.pl $(filter %.t, $^) +# Info formatting -$(tsubj): info/mksubj.pl - perl $(srcdir)/info/mksubj.pl $@ $(filter %.t, $^) +# mksubj.pl reads $(tsrc) and writes $(tsubj). A naive rule +# $(tsubj): $(tsrc) +# COMMAND +# runs COMMAND once for each target. That's because multiple targets +# in an explicit rule is just a shorthand for one rule per target, +# each with the same prerequisites and commands. Use a stamp file. +$(tsubj) info/toc: info/stamp-subj ; +info/stamp-subj: info/mksubj.pl $(tsrc) + $(call quiet-command,perl $(srcdir)/info/mksubj.pl $(subjects) $(filter %.t, $^),GEN '$(tsubj) info/toc') + >$@ -$(ttop): $(tsubj) - perl $(srcdir)/info/mktop.pl $@ $(filter %.t, $^) +info/TOP.t: info/mktop.pl info/subjects.mk + $(call quiet-command,perl $(srcdir)/info/mktop.pl $@ $(subjects),GEN $@) info.nr/all: $(filter-out info.nr/all, $(info.nr)) >$@ @@ -320,51 +383,45 @@ info.html/all.html: info.nr/all info/ls2html.pl $(info.nr): info/CRT.MAC info/INFO.MAC info/Blank.awk -$(subjects.html) info.html/TOP.html: info/subj2html.pl -$(topics.html): info/emp2html.pl +$(info.html): info/emp2html.pl -info.ps: info/TROFF.MAC info/INFO.MAC $(ttop) $(tsubj) $(tsrc) +info.ps: info/TROFF.MAC info/INFO.MAC info/TOP.t $(tsubj) $(tsrc) groff $^ >$@ -# List of source files +# Distributing -# 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 otherwise in -# this build. +.PHONY: dist-source +dist-source: $(addprefix $(srcdir)/, $(src_distgen)) + $(tarball) -x $(srcdir)/src/scripts/gen-tarball-version $(TARNAME) $(version) -C $(srcdir) $(src_distgen) $(src) ifeq ($(revctrl),git) -.PHONY: sources.mk -sources.mk: - echo "src := $(src)" >sources.mk -else -ifneq ($(srcdir),.) -sources.mk: $(srcdir)/sources.mk - cp -f $^ $@ +.PHONY: $(srcdir)/sources.mk +$(srcdir)/sources.mk: + $(call quiet-command,echo "src := $(src)" >$@,GEN $@) endif -endif - -# Distributing - -.PHONY: dist-source -dist-source: $(src_distgen) $(bld_distgen) - $(tarball) $(TARNAME)-$(VERSION) $(bld_distgen) -C $(srcdir) $(src_distgen) $(src) .PHONY: dist-client -dist-client: $(cli_distgen) - $(tarball) $(TARNAME)-client-$(VERSION) \ +dist-client: + $(tarball) -x $(srcdir)/src/scripts/gen-client-configure \ + $(TARNAME)-client $(version) \ -C $(srcdir)/src/client \ - $(notdir $(filter src/client/%, $(src)) $(cli_distgen)) \ - -C $(srcdir)/include proto.h version.h \ + $(notdir $(filter src/client/%, $(src))) \ + -C $(srcdir)/include fnameat.h proto.h version.h \ -C $(srcdir)/src/lib/global version.c \ - -C $(srcdir)/src/lib/w32 getopt.h getopt.c \ + -C $(srcdir)/src/lib/gen fnameat.c \ + -C $(srcdir)/src/lib $(addprefix w32/, $(client/w32)) \ -C $(srcdir)/man empire.6 \ - -C $(srcdir) COPYING INSTALL install-sh + -C $(srcdir)/build-aux install-sh \ + -C $(srcdir) COPYING INSTALL \ + m4/ax_lib_socket_nsl.m4 m4/my_lib_readline.m4 \ + m4/my_terminfo.m4 m4/my_windows_api.m4 .PHONY: dist-info dist-info: info html - $(tarball) $(TARNAME)-info-text-$(VERSION) -C info.nr $(info) - $(tarball) $(TARNAME)-info-html-$(VERSION) -C info.html $(addsuffix .html, $(info)) + $(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) @@ -379,7 +436,7 @@ $(srcdir)/configure: configure.ac aclocal.m4 cd $(srcdir) && autoconf # autoheader might not change config.h.in, so touch a stamp file. -$(srcdir)/config.h.in: stamp-h.in +$(srcdir)/config.h.in: stamp-h.in ; $(srcdir)/stamp-h.in: configure.ac aclocal.m4 cd $(srcdir) && autoheader touch $@ @@ -388,7 +445,7 @@ $(srcdir)/aclocal.m4: $(filter m4/%.m4, $(src)) cd $(srcdir) && aclocal -I m4 # config.status might not change config.h; use the stamp file. -config.h: stamp-h +config.h: stamp-h ; stamp-h: config.h.in config.status ./config.status config.h stamp-h @@ -399,17 +456,4 @@ config.status: configure ./config.status --recheck src/lib/global/path.c src/client/ipglob.c: %: %.in GNUmakefile Make.mk - $(subst.in) <$< >$@ - - -# Make files for standalone client distribution - -$(srcdir)/src/client/configure: src/client/configure.ac src/client/aclocal.m4 - cd $(dir $@) && autoconf - -$(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 $< $@ + $(call quiet-command,$(subst.in) <$< >$@,GEN $@)