Clean up poorly chosen loop control variable names

[empserver] / Make.mk

diff --git a/Make.mk b/Make.mk
index 9c3fcb8c5390270a3552b7192a2b58407b64df4c..adaad9a9665dc06c459db3f3caa85a1cf69082ff 100644 (file)
--- a/Make.mk
+++ b/Make.mk
@@ -74,6 +74,8 @@ gamedir := $(localstatedir)/empire
 builtindir := $(datadir)/empire/builtin
 einfodir := $(datadir)/empire/info.nr
 ehtmldir := $(datadir)/empire/info.html
+client/w32 := arpa/inet.h netdb.h netinet/in.h sys/time.h sys/socket.h \
+sys/uio.h unistd.h w32io.c w32sockets.c w32types.h
 
 # How to substitute Autoconf output variables
 # Recursively expanded so that $@ and $< work.
@@ -133,6 +135,7 @@ endif
 
 ifeq ($(empthread),Windows)    # really: W32, regardless of thread package
 libs += lib/libw32.a
+$(client): lib/libw32.a
 endif
 
 # Cleanliness
@@ -142,9 +145,9 @@ clean := $(obj) $(deps) $(libs) $(util) $(client) $(server) $(tsubj)        \
 $(ttop) $(info.nr) $(info.html) $(empth_obj) $(empth_lib)
 # Removed by distclean:
 distclean := $(ac) $(mk)
-# Distributed by dist-source from $(srcdir)
+# Distributed by dist-source from $(srcdir):
 src_distgen := $(acdist)
-# Distributed by dist-client from $(srcdir)/src/client
+# Distributed by dist-client from $(srcdir)/src/client; removed by distclean:
 cli_distgen := $(acdistcli)
 
 # Compiler flags
@@ -159,8 +162,8 @@ CFLAGS += -Wall -W -Wno-unused-parameter -Wpointer-arith    \
 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs      \
 -Wredundant-decls
 endif
-LDLIBS += -lm
-$(client): LDLIBS += $(termlibs)
+$(client): LDLIBS := $(LIBS_client)
+$(server): LDLIBS := $(LIBS_server)
 
 ### Advertized goals
 
@@ -177,7 +180,7 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-       rm -rf $(distclean)
+       rm -rf $(distclean) $(cli_distgen)
 
 .PHONY: install
 install: all installdirs
@@ -274,9 +277,6 @@ $(server): $(filter src/server/% src/lib/commands/% src/lib/player/% src/lib/sub
 
 $(client): $(filter src/client/%, $(obj)) src/lib/global/version.o
        $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
-ifeq ($(empthread),Windows)
-$(client): src/lib/w32/getopt.o
-endif
 
 $(util): $(libs)
 
@@ -336,7 +336,7 @@ dist-client: $(cli_distgen)
                $(notdir $(filter src/client/%, $(src)) $(cli_distgen)) \
        -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)/src/lib $(addprefix w32/, $(client/w32))           \
        -C $(srcdir)/man empire.6                                       \
        -C $(srcdir) COPYING INSTALL install-sh
 
@@ -390,5 +390,5 @@ $(srcdir)/src/client/config.h.in: src/client/configure.ac src/client/aclocal.m4
        cd $(dir $@) && autoheader
        touch $@
 
-$(srcdir)/src/client/aclocal.m4: m4/lib_socket_nsl.m4
-       cp -f $< $@
+$(srcdir)/src/client/aclocal.m4: m4/lib_socket_nsl.m4 m4/my_terminfo.m4 m4/my_windows_api.m4
+       cat $^ >$@