X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=Make.mk;h=19988c012ec1e6ae6ee50e80d57fea11e49639d5;hp=f0a00b93fd415be94251093fa64cf18d1d4b0249;hb=HEAD;hpb=5a1544f9256177e7452452713dfc76e9d05c7ad8

diff --git a/Make.mk b/Make.mk
index f0a00b93f..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-2014, 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-2014
+#      Markus Armbruster, 2005-2020
 #
 
 # This makefile was inspired by `Recursive Make Considered Harmful',
@@ -47,8 +47,17 @@ all:
 # Source files
 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 number)
 endif
 dirs := $(sort $(dir $(src)))
 csrc := $(filter %.c, $(src))
@@ -63,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
@@ -72,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.
@@ -88,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 \
@@ -101,18 +115,14 @@ subst.in = sed \
 
 # Generated files
 # See `Cleanliness' below
-mk :=
-ifeq ($(revctrl),git)
-mk += $(srcdir)/sources.mk
-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:
@@ -125,7 +135,6 @@ 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)))
@@ -156,26 +165,20 @@ endif
 # Each generated file should be in one of the following sets.
 # Removed by clean:
 clean := $(obj) $(deps) $(libs) $(util) $(client) $(server) $(tsubj)	\
-$(ttop) $(info.all) $(empth_obj) $(empth_lib) sandbox
+info/toc info/TOP.t $(info.all) $(empth_obj) $(empth_lib) sandbox
 # Removed by distclean:
-distclean := $(ac) $(mk)
+distclean := $(ac)
+ifeq ($(revctrl),git)
+distclean += $(addprefix $(srcdir)/, $(mk))
+endif
 # Distributed by dist-source from $(srcdir):
-src_distgen := $(acdist)
-# Distributed by dist-client from $(srcdir)/src/client; removed by distclean:
-cli_distgen := $(acdistcli)
+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
 $(client): LDLIBS := $(LIBS_client)
 $(server): LDLIBS := $(LIBS_server)
 
@@ -195,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
@@ -255,25 +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/fire-test $(srcdir)
-	$(srcdir)/tests/bridgefall-test $(srcdir)
-	$(srcdir)/tests/retreat-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/fire-test SKIPPED"
-	@echo "$(srcdir)/tests/bridgefall-test SKIPPED"
-	@echo "$(srcdir)/tests/retreat-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
@@ -317,7 +330,7 @@ info.html/%.html: info/%.t
 $(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)) src/lib/global/version.o
+$(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)
@@ -332,6 +345,19 @@ $(libs) $(empth_lib):
 	$(call quiet-command,$(AR) rc $@ $?,AR $@)
 	$(RANLIB) $@
 
+src/lib/global/version.o: CPPFLAGS += -DVERSION='"$(version)"'
+src/lib/global/version.o: $(src)
+
+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
+
 # Info formatting
 
 # mksubj.pl reads $(tsrc) and writes $(tsubj).  A naive rule
@@ -345,7 +371,7 @@ info/stamp-subj: info/mksubj.pl $(tsrc)
 	$(call quiet-command,perl $(srcdir)/info/mksubj.pl $(subjects) $(filter %.t, $^),GEN '$(tsubj) info/toc')
 	>$@
 
-$(ttop): info/mktop.pl info/subjects.mk
+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))
@@ -359,34 +385,41 @@ $(info.nr): info/CRT.MAC info/INFO.MAC info/Blank.awk
 
 $(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 $^ >$@
 
 # Distributing
 
 .PHONY: dist-source
-dist-source: $(src_distgen)
+dist-source: $(addprefix $(srcdir)/, $(src_distgen))
+	$(tarball) -x $(srcdir)/src/scripts/gen-tarball-version $(TARNAME) $(version) -C $(srcdir) $(src_distgen) $(src)
+
 ifeq ($(revctrl),git)
-	echo "src := $(src)" >$(srcdir)/sources.mk
+.PHONY: $(srcdir)/sources.mk
+$(srcdir)/sources.mk:
+	$(call quiet-command,echo "src := $(src)" >$@,GEN $@)
 endif
-	$(tarball) $(TARNAME)-$(VERSION) -C $(srcdir) $(src_distgen) $(src) sources.mk
 
 .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/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
-	$(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
 
@@ -424,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_terminfo.m4 m4/my_windows_api.m4
-	cat $^ >$@