Merge branch 'readline'

[empserver] / Make.mk

diff --git a/Make.mk b/Make.mk
index 6ea44d09c4cd1504f016c5afd41586cc6d65c98f..8c921d3091a4ace436247923307745231d3d5ce5 100644 (file)
--- a/Make.mk
+++ b/Make.mk
@@ -1,6 +1,6 @@
 #
 #   Empire - A multi-player, client/server Internet based war game.
-#   Copyright (C) 1986-2015, Dave Pare, Jeff Bailey, Thomas Ruschak,
+#   Copyright (C) 1986-2016, 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-2015
+#      Markus Armbruster, 2005-2016
 #
 
 # This makefile was inspired by `Recursive Make Considered Harmful',
@@ -47,8 +47,13 @@ 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)
 else
 include $(srcdir)/sources.mk
+version := $(shell cat $(srcdir)/.tarball-version || echo "UNKNOWN")
+endif
+ifeq ($(version),UNKNOWN)
+$(error cannot figure out version)
 endif
 dirs := $(sort $(dir $(src)))
 csrc := $(filter %.c, $(src))
@@ -101,10 +106,8 @@ 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)))
@@ -125,7 +128,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,11 +158,14 @@ 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)
+src_distgen := $(acdist) $(mk)
 # Distributed by dist-client from $(srcdir)/src/client; removed by distclean:
 cli_distgen := $(acdistcli)
 
@@ -260,6 +265,8 @@ ifeq ($(empthread),LWP)
        $(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)
 else
        @echo "$(srcdir)/tests/smoke-test SKIPPED"
        @echo "$(srcdir)/tests/actofgod-test SKIPPED"
@@ -269,6 +276,8 @@ else
        @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"
 endif
        $(srcdir)/tests/empdump-test $(srcdir)
 
@@ -329,6 +338,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: .tarball-version
+       >$@
+include $(srcdir)/.dirty-stamp
+endif
+
 # Info formatting
 
 # mksubj.pl reads $(tsrc) and writes $(tsubj).  A naive rule
@@ -342,7 +364,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))
@@ -356,21 +378,24 @@ $(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)
+       $(tarball) $(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)                         \
+       $(tarball) $(TARNAME)-client $(version)                         \
        -C $(srcdir)/src/client                                         \
                $(notdir $(filter src/client/%, $(src)) $(cli_distgen)) \
        -C $(srcdir)/include fnameat.h proto.h version.h                \
@@ -383,8 +408,8 @@ dist-client: $(cli_distgen)
 
 .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