X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=Make.mk;h=e3e96e1e3fba6560b79e77cffbb11181347e952a;hp=29cd347276589e20d14c241b5cf0578d351bd4cd;hb=015b93b71cde04dad51f08ffa2111c7e6177e91e;hpb=88698d73c75a81f84c22d1064c83a91225f699f8

diff --git a/Make.mk b/Make.mk
index 29cd34727..e3e96e1e3 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-2020, 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-2017
 #
 
 # 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))
@@ -101,18 +110,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:
@@ -157,11 +162,12 @@ endif
 clean := $(obj) $(deps) $(libs) $(util) $(client) $(server) $(tsubj)	\
 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.
@@ -187,7 +193,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
@@ -254,6 +260,7 @@ ifeq ($(empthread),LWP)
 	$(srcdir)/tests/smoke-test $(srcdir)
 	$(srcdir)/tests/actofgod-test $(srcdir)
 	$(srcdir)/tests/build-test $(srcdir)
+	$(srcdir)/tests/load-tend-test $(srcdir)
 	$(srcdir)/tests/navi-march-test $(srcdir)
 	$(srcdir)/tests/fire-test $(srcdir)
 	$(srcdir)/tests/torpedo-test $(srcdir)
@@ -265,6 +272,7 @@ else
 	@echo "$(srcdir)/tests/smoke-test SKIPPED"
 	@echo "$(srcdir)/tests/actofgod-test SKIPPED"
 	@echo "$(srcdir)/tests/build-test SKIPPED"
+	@echo "$(srcdir)/tests/load-tend-test SKIPPED"
 	@echo "$(srcdir)/tests/navi-march-test SKIPPED"
 	@echo "$(srcdir)/tests/fire-test SKIPPED"
 	@echo "$(srcdir)/tests/torpedo-test SKIPPED"
@@ -317,7 +325,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 +340,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
@@ -365,28 +386,35 @@ info.ps: info/TROFF.MAC info/INFO.MAC info/TOP.t $(tsubj) $(tsrc)
 # 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 +452,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 $^ >$@