-#
+#
# Empire - A multi-player, client/server Internet based war game.
-# Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
+# Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
# Ken Stevens, Steve McClure
-#
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
+#
# ---
-#
+#
# See files README, COPYING and CREDITS in the root of the source
# tree for related information and legal notices. It is expected
# that future projects/authors will amend these files as needed.
-#
+#
# ---
-#
+#
# Make.mk: The real Makefile, included by GNUmakefile
-#
+#
# Known contributors to this file:
-# Markus Armbruster, 2005-2007
-#
+# Markus Armbruster, 2005-2008
+#
# This makefile was inspired by `Recursive Make Considered Harmful',
# Peter Miller, 1997.
# Source files
ifeq ($(revctrl),git)
-src := $(shell cd $(srcdir) && git-ls-files)
+src := $(shell cd $(srcdir) && git ls-files)
else
include $(srcdir)/sources.mk
endif
# Generated files
# See `Cleanliness' below
-# sources.mk subjects.mk
+mk := subjects.mk
+ifeq ($(revctrl),git)
+mk += $(srcdir)/sources.mk
+endif
# Generated by Autoconf, not distributed:
ac := config.h config.log config.status info.html info.nr lib stamp-h
ac += $(basename $(filter %.in, $(src)))
# Dependencies:
deps := $(obj:.o=.d)
# Library archives:
-libs := $(addprefix lib/, libcommon.a libgen.a libglobal.a)
+libs := $(addprefix lib/, libcommon.a libas.a libgen.a libglobal.a)
# Programs:
-util := $(addprefix src/util/, $(addsuffix $(EXEEXT), empsched fairland files pconfig))
+util := $(addprefix src/util/, $(addsuffix $(EXEEXT), empdump empsched fairland files pconfig))
client := src/client/empire$(EXEEXT)
server := src/server/emp_server$(EXEEXT)
# Info subjects:
info.html := $(addprefix info.html/, $(addsuffix .html, $(info)))
# Conditionally generated files:
+empth_obj := src/lib/empthread/io.o
+empth_lib :=
ifeq ($(empthread),LWP)
-empth_obj := src/lib/empthread/lwp.o src/lib/empthread/posix.o
-empth_lib := lib/liblwp.a
+empth_obj += src/lib/empthread/lwp.o src/lib/empthread/posix.o
+empth_lib += lib/liblwp.a
endif
ifeq ($(empthread),POSIX)
-empth_obj := src/lib/empthread/pthread.o src/lib/empthread/posix.o
-empth_lib :=
+empth_obj += src/lib/empthread/pthread.o src/lib/empthread/posix.o
endif
ifeq ($(empthread),Windows)
-empth_obj := src/lib/empthread/ntthread.o
-empth_lib :=
+empth_obj += src/lib/empthread/ntthread.o
endif
ifeq ($(empthread),Windows) # really: W32, regardless of thread package
clean := $(obj) $(deps) $(libs) $(util) $(client) $(server) $(tsubj) \
$(ttop) $(info.nr) $(info.html) $(empth_obj) $(empth_lib)
# Removed by distclean:
-distclean := $(ac) subjects.mk
+distclean := $(ac) $(mk)
# Distributed by dist-source from $(srcdir)
-src_distgen := $(acdist)
-# Distributed by dist-source from .
-bld_distgen := sources.mk
+src_distgen := $(acdist) sources.mk
# Distributed by dist-client from $(srcdir)/src/client
cli_distgen := $(acdistcli)
ifeq ($(have_gcc),yes)
CFLAGS += -fno-builtin-carg # conflicts with our carg()
CFLAGS += -fno-common
-CFLAGS += -Wall -W -Wno-unused -Wpointer-arith -Wstrict-prototypes \
--Wmissing-prototypes -Wnested-externs -Wredundant-decls
+CFLAGS += -Wall -W -Wno-unused-parameter -Wpointer-arith \
+-Wstrict-prototypes -Wmissing-prototypes -Wnested-externs \
+-Wredundant-decls
endif
LDLIBS += -lm
$(client): LDLIBS += $(termlibs)
# addition to %.o.
ifeq ($(how_to_dep),fast)
%.o: %.c
- $(COMPILE.c) -MT $@ -MMD -MP $(OUTPUT_OPTION) $<
+ $(COMPILE.c) -MT $@ -MMD -MP -MF $(@:.o=.d) $(OUTPUT_OPTION) $< \
+ || { rm -f $(@:.o=.d) $@; false; }
+# Why the rm? If gcc's preprocessor chokes, it leaves an empty
+# dependency file behind, and doesn't touch the object file. If an
+# old object file exists, and is newer than the .c file, make will
+# then consider the object file up-to-date.
endif
ifeq ($(how_to_dep),depcomp)
%.o: %.c
# Compilation
-$(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)
+$(server): $(filter src/server/% src/lib/commands/% src/lib/player/% src/lib/subs/% src/lib/update/%, $(obj)) $(empth_obj) $(empth_lib) $(libs)
$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
$(client): $(filter src/client/%, $(obj)) src/lib/global/version.o
$(util): $(libs)
+lib/libas.a: $(filter src/lib/as/%, $(obj))
lib/libcommon.a: $(filter src/lib/common/%, $(obj))
lib/libgen.a: $(filter src/lib/gen/%, $(obj))
lib/libglobal.a: $(filter src/lib/global/%, $(obj))
# List of source files
-# Note: $(srcdir)/sources.mk is only used when the source tree came
-# from a tarball rather than git. The following rules create a
-# sources.mk to put into the tarball. It is not used in this build.
-
+# Note: $(srcdir)/sources.mk is only included when the source tree
+# came from a tarball rather than git. The following rule creates a
+# it only for putting it into the tarball. It is not used otherwise
+# in this build.
ifeq ($(revctrl),git)
-sources.mk:
- echo "src := $(src)" >sources.mk
-else
-ifneq ($(srcdir),.)
-sources.mk: $(srcdir)/sources.mk
- cp -f $^ $@
-endif
+.PHONY: $(srcdir)/sources.mk
+$(srcdir)/sources.mk:
+ echo "src := $(src)" >$@
endif
# Distributing
.PHONY: dist-source
-dist-source: $(src_distgen) $(bld_distgen)
- $(tarball) $(TARNAME)-$(VERSION) $(bld_distgen) -C $(srcdir) $(src_distgen) $(src)
+dist-source: $(src_distgen)
+ $(tarball) $(TARNAME)-$(VERSION) -C $(srcdir) $(src_distgen) $(src)
.PHONY: dist-client
dist-client: $(cli_distgen)