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
# How to substitute Autoconf output variables
# Recursively expanded so that $@ and $< work.
subst.in = sed \
- -e 's?@configure_input\@?$(notdir $@). Generated from $(notdir $<) by GNUmakefile.?g' \
+ -e 's?@configure_input\@?$(notdir $@): Generated from $(notdir $<) by make.?g' \
-e 's?@builtindir\@?$(builtindir)?g' \
-e 's?@econfig\@?$(econfig)?g' \
-e 's?@einfodir\@?$(einfodir)?g' \
empth_lib :=
endif
+ifeq ($(empthread),Windows) # really: W32, regardless of thread package
+libs += lib/libw32.a
+endif
+
# Cleanliness
# Each generated file should be in one of the following sets.
# Removed by clean:
# Compiler flags
CPPFLAGS += -I$(srcdir)/include -I.
+ifeq ($(empthread),Windows) # really: W32, regardless of thread package
+CPPFLAGS += -I$(srcdir)/src/lib/w32
+endif
ifeq ($(have_gcc),yes)
CFLAGS += -fno-builtin-carg # conflicts with our carg()
CFLAGS += -fno-common
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)
lib/libgen.a: $(filter src/lib/gen/%, $(obj))
lib/libglobal.a: $(filter src/lib/global/%, $(obj))
lib/liblwp.a: $(filter src/lib/lwp/%, $(obj))
+lib/libw32.a: $(filter src/lib/w32/%, $(obj))
$(libs) $(empth_lib):
$(AR) rc $@ $?
perl $(srcdir)/info/mktop.pl $@ $(filter %.t, $^)
info.nr/all: $(filter-out info.nr/all, $(info.nr))
- (cd info.nr && LC_ALL=C ls -C $(info)) >$@
-# FIXME shouldn't use ls
+ >$@
+ (cd info.nr && LC_ALL=C ls -C $(info)) >>$@
-info.html/all.html: $(filter-out info.html/all.html, $(info.html)) info/ls2html.pl
- (cd info.html && LC_ALL=C ls -C $(notdir $(info.html))) | expand | perl $(filter %.pl, $^) >$@
-# FIXME shouldn't use ls
+info.html/all.html: info.nr/all info/ls2html.pl
+ expand $< | perl $(srcdir)/info/ls2html.pl >$@
$(info.nr): info/CRT.MAC info/INFO.MAC info/Blank.awk
$(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