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

diff --git a/Make.mk b/Make.mk
index dce0e7cb7..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-2017, 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
@@ -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))
@@ -114,8 +118,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,9 +168,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)
-distclean += $(addprefix $(srcdir)/, $(cli_distgen))
 
 # Compiler flags
 CPPFLAGS += -I$(srcdir)/include -I.
@@ -261,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)
@@ -272,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"
@@ -347,7 +348,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
@@ -385,8 +386,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
@@ -395,17 +396,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
@@ -448,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_lib_readline.m4 m4/my_terminfo.m4 m4/my_windows_api.m4
-	cat $^ >$@