(sysdep_stdin_init) [_WIN32]: Add missing void for the parameter list.

[empserver] / Make.mk

diff --git a/Make.mk b/Make.mk
index fb9543a1675ab0feb4f7d13fde03f017620f24af..9b838683f618178955576d7cc7ec37bea68a3e6d 100644 (file)
--- a/Make.mk
+++ b/Make.mk
@@ -28,7 +28,7 @@
 #   Make.mk: 
 #  
 #   Known contributors to this file:
-#      Markus Armbruster, 2005
+#      Markus Armbruster, 2005-2007
 # 
 
 # This makefile was inspired by `Recursive Make Considered Harmful',
@@ -63,7 +63,7 @@ subjects.html := $(addprefix info.html/, $(addsuffix .html, $(subjects)))
 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
@@ -74,7 +74,7 @@ ehtmldir := $(datadir)/empire/info.html
 # 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'        \
@@ -95,7 +95,6 @@ acdist := aclocal.m4 config.h.in configure stamp-h.in
 acdistcli := $(addprefix src/client/, aclocal.m4 config.h.in configure)
 # Object files:
 obj := $(csrc:.c=.o) $(filter %.o, $(ac:.c=.o))
-# TODO AIX needs lwpInit.o lwpRestore.o lwpSave.o unless UCONTEXT
 # Dependencies:
 deps := $(obj:.o=.d)
 # Library archives:
@@ -125,6 +124,10 @@ empth_obj := src/lib/empthread/ntthread.o
 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:
@@ -141,6 +144,9 @@ cli_distgen := $(acdistcli)
 
 # 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
@@ -179,8 +185,10 @@ install: all installdirs
        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                                                        \
@@ -209,8 +217,7 @@ uninstall:
        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
@@ -254,7 +261,7 @@ info.html/%.html: info/%.t
 $(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)
@@ -263,6 +270,7 @@ lib/libcommon.a: $(filter src/lib/common/%, $(obj))
 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 $@ $?
@@ -284,12 +292,11 @@ $(ttop): $(tsubj)
        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
 
@@ -323,7 +330,9 @@ dist-client: $(cli_distgen)
        $(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