X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=Make.mk;h=19988c012ec1e6ae6ee50e80d57fea11e49639d5;hp=8c921d3091a4ace436247923307745231d3d5ce5;hb=HEAD;hpb=d3a64a4f6e8aa1dc1ee027086aa9b280864e80e4 diff --git a/Make.mk b/Make.mk index 8c921d309..19988c012 100644 --- a/Make.mk +++ b/Make.mk @@ -1,6 +1,6 @@ # # Empire - A multi-player, client/server Internet based war game. -# Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak, +# Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak, # Ken Stevens, Steve McClure, Markus Armbruster # # Empire is free software: you can redistribute it and/or modify @@ -27,7 +27,7 @@ # Make.mk: The real Makefile, included by GNUmakefile # # Known contributors to this file: -# Markus Armbruster, 2005-2016 +# Markus Armbruster, 2005-2020 # # This makefile was inspired by `Recursive Make Considered Harmful', @@ -48,12 +48,16 @@ all: ifeq ($(revctrl),git) 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) +$(error cannot figure out version number) endif dirs := $(sort $(dir $(src))) csrc := $(filter %.c, $(src)) @@ -68,7 +72,7 @@ include $(srcdir)/info/subjects.mk topics := $(patsubst %.t,%,$(notdir $(tsrc))) info := $(topics) $(subjects) all TOP 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 @@ -77,8 +81,8 @@ edatadir := $(datadir)/empire builtindir := $(edatadir)/builtin einfodir := $(edatadir)/info.nr ehtmldir := $(edatadir)/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 +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. @@ -93,6 +97,11 @@ 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. subst.in = sed \ @@ -114,8 +123,6 @@ 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: @@ -166,8 +173,6 @@ distclean += $(addprefix $(srcdir)/, $(mk)) endif # Distributed by dist-source from $(srcdir): src_distgen := $(acdist) $(mk) -# Distributed by dist-client from $(srcdir)/src/client; removed by distclean: -cli_distgen := $(acdistcli) # Compiler flags CPPFLAGS += -I$(srcdir)/include -I. @@ -193,7 +198,7 @@ clean: .PHONY: distclean distclean: clean - $(call quiet-command,rm -rf $(distclean) $(cli_distgen),DISTCLEAN) + $(call quiet-command,rm -rf $(distclean),DISTCLEAN) .PHONY: install install: all installdirs @@ -253,33 +258,35 @@ check: export EMPIRE_CHECK_ACCEPT := check-accept: export EMPIRE_CHECK_ACCEPT := y _check: all @echo "Warning: test suite is immature and needs work." >&2 - $(srcdir)/tests/files-test $(srcdir) - $(srcdir)/tests/fairland-test $(srcdir) - $(srcdir)/tests/info-test $(srcdir) + $(call run-test, $(srcdir)/tests/files-test) + $(call run-test, $(srcdir)/tests/fairland-test) + $(call run-test, $(srcdir)/tests/info-test) ifeq ($(empthread),LWP) - $(srcdir)/tests/smoke-test $(srcdir) - $(srcdir)/tests/actofgod-test $(srcdir) - $(srcdir)/tests/build-test $(srcdir) - $(srcdir)/tests/navi-march-test $(srcdir) - $(srcdir)/tests/fire-test $(srcdir) - $(srcdir)/tests/torpedo-test $(srcdir) - $(srcdir)/tests/bridgefall-test $(srcdir) - $(srcdir)/tests/retreat-test $(srcdir) - $(srcdir)/tests/update-test $(srcdir) - $(srcdir)/tests/version-test $(srcdir) + $(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 "$(srcdir)/tests/smoke-test SKIPPED" - @echo "$(srcdir)/tests/actofgod-test SKIPPED" - @echo "$(srcdir)/tests/build-test SKIPPED" - @echo "$(srcdir)/tests/navi-march-test SKIPPED" - @echo "$(srcdir)/tests/fire-test SKIPPED" - @echo "$(srcdir)/tests/torpedo-test SKIPPED" - @echo "$(srcdir)/tests/bridgefall-test SKIPPED" - @echo "$(srcdir)/tests/retreat-test SKIPPED" - @echo "$(srcdir)/tests/update-test SKIPPED" - @echo "$(srcdir)/tests/version-test SKIPPED" + @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 - $(srcdir)/tests/empdump-test $(srcdir) + $(call run-test, $(srcdir)/tests/empdump-test) ### Implicit rules @@ -346,7 +353,7 @@ $(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: .tarball-version +$(srcdir)/.dirty-stamp: $(srcdir)/.tarball-version >$@ include $(srcdir)/.dirty-stamp endif @@ -384,8 +391,8 @@ info.ps: info/TROFF.MAC info/INFO.MAC info/TOP.t $(tsubj) $(tsrc) # Distributing .PHONY: dist-source -dist-source: $(src_distgen) - $(tarball) $(TARNAME) $(version) -C $(srcdir) $(src_distgen) $(src) +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: $(srcdir)/sources.mk @@ -394,17 +401,20 @@ $(srcdir)/sources.mk: endif .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)) \ + $(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/gen fnameat.c \ -C $(srcdir)/src/lib $(addprefix w32/, $(client/w32)) \ -C $(srcdir)/man empire.6 \ -C $(srcdir)/build-aux install-sh \ - -C $(srcdir) COPYING INSTALL + -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 @@ -447,16 +457,3 @@ config.status: configure src/lib/global/path.c src/client/ipglob.c: %: %.in GNUmakefile Make.mk $(call quiet-command,$(subst.in) <$< >$@,GEN $@) - - -# 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/ax_lib_socket_nsl.m4 m4/my_lib_readline.m4 m4/my_terminfo.m4 m4/my_windows_api.m4 - cat $^ >$@