Improve message when refusing to load plane on unsuitable ship

[empserver] / Make.mk

diff --git a/Make.mk b/Make.mk
index ddee0722ac0442f133b877b3bac6a0e7592eb5f3..adaad9a9665dc06c459db3f3caa85a1cf69082ff 100644 (file)
--- a/Make.mk
+++ b/Make.mk
@@ -54,7 +54,6 @@ endif
 dirs := $(sort $(dir $(src)))
 csrc := $(filter %.c, $(src))
 tsrc := $(filter %.t, $(src))
-m4src := $(filter m4/%.m4, $(src))
 man6 := $(filter man/%.6, $(src))
 builtins := $(filter src/lib/global/%.config, $(src))
 
@@ -75,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.
@@ -134,6 +135,7 @@ endif
 
 ifeq ($(empthread),Windows)    # really: W32, regardless of thread package
 libs += lib/libw32.a
+$(client): lib/libw32.a
 endif
 
 # Cleanliness
@@ -160,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
 
@@ -275,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)
 
@@ -337,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
 
@@ -364,7 +363,7 @@ $(srcdir)/stamp-h.in: configure.ac aclocal.m4
        cd $(srcdir) && autoheader
        touch $@
 
-$(srcdir)/aclocal.m4: $(m4src)
+$(srcdir)/aclocal.m4: $(filter m4/%.m4, $(src))
        cd $(srcdir) && aclocal -I m4
 
 # config.status might not change config.h; use the stamp file.
@@ -391,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: $(m4src)
-       cd $(srcdir)/src/client && aclocal -I ../../m4
+$(srcdir)/src/client/aclocal.m4: m4/lib_socket_nsl.m4 m4/my_terminfo.m4 m4/my_windows_api.m4
+       cat $^ >$@