X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=Make.mk;h=e809e376dc2e6ada793536eece2a0cd9eee0b0ef;hp=0e572861f0d4f47aeb130f40637b954ea58e5bf5;hb=54b1e7e167fd594d39ff91fd78e34cb8b411162b;hpb=bb0f3a656ef1bd9e1541e891e714f57234c003b7 diff --git a/Make.mk b/Make.mk index 0e572861f..e809e376d 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-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 @@ -109,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: @@ -161,8 +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) # Compiler flags CPPFLAGS += -I$(srcdir)/include -I. @@ -188,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 @@ -255,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) @@ -266,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" @@ -318,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) @@ -333,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 @@ -366,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 @@ -376,21 +396,25 @@ $(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)) \ - -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 @@ -428,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 $^ >$@