# 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))
# 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)))
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)
+src_distgen := $(acdist) $(mk)
# Distributed by dist-client from $(srcdir)/src/client; removed by distclean:
cli_distgen := $(acdistcli)
$(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)
$(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
.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 proto.h version.h \
+ -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 \
.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
cd $(dir $@) && autoheader
touch $@
-$(srcdir)/src/client/aclocal.m4: m4/ax_lib_socket_nsl.m4 m4/my_terminfo.m4 m4/my_windows_api.m4
+$(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 $^ >$@