topics.html := $(addprefix info.html/, $(addsuffix .html, $(topics)))
scripts := $(srcdir)/src/scripts
depcomp := $(SHELL) $(srcdir)/depcomp
-tarball := $(SHELL) $(scripts)/tarball
+tarball := $(SHELL) -e $(scripts)/tarball
econfig := $(sysconfdir)/empire/econfig
schedule := $(sysconfdir)/empire/schedule
gamedir := $(localstatedir)/empire
echo 'every 10 minutes' >>$(schedule).dist
[ -e $(schedule) ] || mv $(schedule).dist $(schedule)
if [ -e $(econfig) ]; then \
+ echo "Attempting to update your econfig"; \
if src/util/pconfig $(econfig) >$(econfig).dist; then \
if cmp -s $(econfig) $(econfig).dist; then \
+ echo "$(econfig) unchanged"; \
rm $(econfig).dist; \
fi; \
else \
rm -f $(addprefix $(bindir)/, $(notdir $(client)))
rm -rf $(builtindir) $(einfodir)
rm -f $(addprefix $(mandir)/man6/, $(notdir $(man6)))
- @[ -e $(gamedir) ] && echo "$(gamedir) not removed, you may wish to remove it manually."
- @[ -e $(econfig) ] && echo "$(econfig) not removed, you may wish to remove it manually."
+ @echo "$(dir $(econfig)) and $(gamedir) not removed, you may wish to remove it manually."
.PHONY: dist
dist: dist-source dist-client dist-info
$(server): $(filter src/server/% src/lib/as/% src/lib/commands/% src/lib/player/% src/lib/subs/% src/lib/update/%, $(obj)) $(empth_obj) $(libs) $(empth_lib)
$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
-$(client): $(filter src/client/%, $(obj))
+$(client): $(filter src/client/%, $(obj)) src/lib/global/version.o src/lib/w32/getopt.o
$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
$(util): $(libs)
$(tarball) $(TARNAME)-client-$(VERSION) \
-C $(srcdir)/src/client \
$(notdir $(filter src/client/%, $(src)) $(cli_distgen)) \
- -C $(srcdir)/include proto.h \
+ -C $(srcdir)/include proto.h version.h \
+ -C $(srcdir)/src/lib/global version.c \
+ -C $(srcdir)/src/lib/w32 getopt.h getopt.c \
-C $(srcdir)/man empire.6 \
-C $(srcdir) COPYING INSTALL install-sh