X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=Make.mk;h=c16d73b8d978a02c565ae25bead849093c515efd;hp=ac107263c36b049045e228ae7d6c424ed00a8705;hb=refs%2Fheads%2Fempdump-v4.3.11;hpb=4ea4a01fd524099ba40ba667c7157ce722489252

diff --git a/Make.mk b/Make.mk
index ac107263c..c16d73b8d 100644
--- a/Make.mk
+++ b/Make.mk
@@ -1,6 +1,6 @@
 # 
 #   Empire - A multi-player, client/server Internet based war game.
-#   Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+#   Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
 #                            Ken Stevens, Steve McClure
 # 
 #   This program is free software; you can redistribute it and/or modify
@@ -19,16 +19,16 @@
 # 
 #   ---
 # 
-#   See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
-#   related information and legal notices. It is expected that any future
-#   projects/authors will amend these files as needed.
+#   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: 
+#   Make.mk: The real Makefile, included by GNUmakefile
 #  
 #   Known contributors to this file:
-#      Markus Armbruster, 2005
+#      Markus Armbruster, 2005-2007
 # 
 
 # This makefile was inspired by `Recursive Make Considered Harmful',
@@ -39,64 +39,131 @@
 # slow and tricky.  Do not use them gratuitously.  If you don't
 # understand this, always use `:=' rather than `='.
 
+# Default goal
+all:
+
 # Delete target on error.  Every Makefile should have this.
 .DELETE_ON_ERROR:
 
 # Source files
--include sources.mk
+ifeq ($(revctrl),git)
+src := $(shell cd $(srcdir) && git-ls-files)
+else
+include $(srcdir)/sources.mk
+endif
 dirs := $(sort $(dir $(src)))
 csrc := $(filter %.c, $(src))
 tsrc := $(filter %.t, $(src))
+man6 := $(filter man/%.6, $(src))
+builtins := $(filter src/lib/global/%.config, $(src))
 
-# Info topics and subjects
+# Info subjects (automatically generated)
 -include subjects.mk
+
+# Abbreviations
 topics := $(patsubst %.t,%,$(notdir $(tsrc)))
-info := $(topics) $(subjects) all
+info := $(topics) $(subjects) all TOP
+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) -e $(scripts)/tarball
+econfig := $(sysconfdir)/empire/econfig
+schedule := $(sysconfdir)/empire/schedule
+gamedir := $(localstatedir)/empire
+builtindir := $(datadir)/empire/builtin
+einfodir := $(datadir)/empire/info.nr
+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 make.?g' \
+	-e 's?@builtindir\@?$(builtindir)?g'	\
+	-e 's?@econfig\@?$(econfig)?g'		\
+	-e 's?@einfodir\@?$(einfodir)?g'	\
+	-e 's?@gamedir\@?$(gamedir)?g'		\
+	-e 's/@EMPIREHOST\@/$(EMPIREHOST)/g'	\
+	-e 's/@EMPIREPORT\@/$(EMPIREPORT)/g'
 
 # Generated files
-mk := sources.mk subjects.mk
-ac := autom4te.cache config.h config.status config.log stamp-h	\
-$(basename $(filter %.in, $(src)))
+# See `Cleanliness' below
+# sources.mk subjects.mk
+# Generated by Autoconf, not distributed:
+ac := config.h config.log config.status info.html info.nr lib stamp-h
+ac += $(basename $(filter %.in, $(src)))
+ac += $(srcdir)/autom4te.cache $(srcdir)/src/client/autom4te.cache
+# distributed by dist-source from $(srcdir):
+acdist := aclocal.m4 config.h.in configure stamp-h.in
+# distributed by dist-client from $(srcdir):
+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)
-libs := $(addprefix lib/, libcommon.a libgen.a libglobal.a)
-util := $(addprefix src/util/, fairland files pconfig)
-progs := $(util) src/client/empire src/server/emp_server
+# Library archives:
+libs := $(addprefix lib/, libcommon.a libas.a libgen.a libglobal.a)
+# Programs:
+util := $(addprefix src/util/, $(addsuffix $(EXEEXT), empdump empsched fairland files pconfig))
+client := src/client/empire$(EXEEXT)
+server := src/server/emp_server$(EXEEXT)
+# Info subjects:
 tsubj := $(addprefix info/, $(addsuffix .t, $(subjects)))
 ttop := info/TOP.t
+# Formatted info:
 info.nr := $(addprefix info.nr/, $(info))
-subjects.html := $(addprefix info.html/, $(addsuffix .html, $(subjects)))
-topics.html := $(addprefix info.html/, $(addsuffix .html, $(topics)))
 info.html := $(addprefix info.html/, $(addsuffix .html, $(info)))
 
-ifeq ($(empthread),POSIX)
-empth_obj := src/lib/empthread/pthread.o
+# Conditionally generated files:
+empth_obj := src/lib/empthread/io.o
 empth_lib :=
-else
-empth_obj := src/lib/empthread/lwp.o
-empth_lib := lib/liblwp.a
+ifeq ($(empthread),LWP)
+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
+endif
+ifeq ($(empthread),Windows)
+empth_obj += src/lib/empthread/ntthread.o
 endif
 
-# Abbreviations
-scripts = $(srcdir)/src/scripts
-clean := $(obj) $(deps) $(libs) $(progs) $(empth_lib) $(tsubj)	\
-$(info.nr) $(info.html)
-distclean := $(ac) info/stamp $(ttop)
+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:
+clean := $(obj) $(deps) $(libs) $(util) $(client) $(server) $(tsubj)	\
+$(ttop) $(info.nr) $(info.html) $(empth_obj) $(empth_lib)
+# Removed by distclean:
+distclean := $(ac) subjects.mk
+# Distributed by dist-source from $(srcdir)
+src_distgen := $(acdist)
+# Distributed by dist-source from .
+bld_distgen := sources.mk
+# Distributed by dist-client from $(srcdir)/src/client
+cli_distgen := $(acdistcli)
 
 # Compiler flags
-CPPFLAGS += -I$(srcdir)/include -Iinclude
+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
 CFLAGS += -Wall -W -Wno-unused -Wpointer-arith -Wstrict-prototypes	\
 -Wmissing-prototypes -Wnested-externs -Wredundant-decls
 endif
 LDLIBS += -lm
+$(client): LDLIBS += $(termlibs)
 
 ### Advertized goals
 
 .PHONY: all
-all: $(progs) info
+all: $(util) $(client) $(server) info
 
 .PHONY: info html
 info: $(info.nr)
@@ -110,19 +177,54 @@ clean:
 distclean: clean
 	rm -rf $(distclean)
 
-.PHONY: install install-html
-install: all
-	false # FIXME
+.PHONY: install
+install: all installdirs
+	$(INSTALL_PROGRAM) $(util) $(server) $(sbindir)
+	$(INSTALL_PROGRAM) $(client) $(bindir)
+	$(INSTALL) -m 444 $(addprefix $(srcdir)/, $(builtins)) $(builtindir)
+	$(INSTALL_DATA) $(info.nr) $(einfodir)
+	$(INSTALL_DATA) $(addprefix $(srcdir)/, $(man6)) $(mandir)/man6
+	sed -e '1,/^$$/d' -e 's/^/# /g' <$(srcdir)/doc/schedule >$(schedule).dist
+	echo >>$(schedule).dist
+	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							\
+		echo "Your $(econfig) doesn't work";			\
+		src/util/pconfig >$(econfig).dist;			\
+	    fi;								\
+	    if [ -e $(econfig).dist ]; then				\
+		echo "Check out $(econfig).dist";			\
+	    fi;								\
+	else								\
+	    src/util/pconfig >$(econfig);				\
+	fi
+
+.PHONY: installdirs
+installdirs:
+	mkdir -p $(sbindir) $(bindir) $(builtindir) $(einfodir) $(mandir)/man6 $(dir $(econfig)) $(gamedir)
+
+.PHONY: install-html
 install-html: html
-	false # FIXME
+	mkdir -p $(ehtmldir)
+	$(INSTALL_DATA) $(info.html) $(ehtmldir)
 
 .PHONY: uninstall
 uninstall:
-	false # FIXME
+	rm -f $(addprefix $(sbindir)/, $(notdir $(util) $(server)))
+	rm -f $(addprefix $(bindir)/, $(notdir $(client)))
+	rm -rf $(builtindir) $(einfodir)
+	rm -f $(addprefix $(mandir)/man6/, $(notdir $(man6)))
+	@echo "$(dir $(econfig)) and $(gamedir) not removed, you may wish to remove it manually."
 
 .PHONY: dist
-dist:
-	false # FIXME
+dist: dist-source dist-client dist-info
 
 
 ### Implicit rules
@@ -142,9 +244,15 @@ endif
 # automatic dependency generation
 %: %.c
 
+# Work around MinGW Make's broken built-in link rule:
+%$(EXEEXT): %.o
+	$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
+
+
 info.nr/%: info/%.t
-	$(NROFF) -I $(srcdir)/info $(filter %/CRT.MAC, $^) $< | $(AWK) -f $(filter %/Blank.awk, $^) >$@
-# FIXME AT&T nroff doesn't grok -I
+	$(NROFF) $(filter %.MAC, $^) $< | $(AWK) -f $(filter %/Blank.awk, $^) >$@
+# Pipes in make are a pain.  Catch obvious errors:
+	@test -s $@
 
 info.html/%.html: info/%.t
 	perl $(filter %.pl, $^) $< >$@
@@ -152,66 +260,102 @@ info.html/%.html: info/%.t
 
 ### Explicit rules
 
-src/server/emp_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)
+# Compilation
+
+$(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 $@
 
-src/client/empire: $(filter src/client/%, $(obj)) $(termlibs)
+$(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)
 
+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))
 lib/liblwp.a: $(filter src/lib/lwp/%, $(obj))
+lib/libw32.a: $(filter src/lib/w32/%, $(obj))
 
-$(libs) $(empth_lib): | lib
+$(libs) $(empth_lib):
 	$(AR) rc $@ $?
 	$(RANLIB) $@
 
-# info.pl reads $(tsrc) and writes subjects.mk $(ttop) $(tsubj).  The
-# naive rule
-#     subjects.mk $(ttop) $(tsubj): $(tsrc)
-#           COMMAND
-# runs COMMAND once for each target.  That's because multiple targets
-# in an explicit rule is just a shorthand for one rule per target,
-# each with the same prerequisites and commands.  A pattern rule with
-# multiple targets does what we want.  So we artificially turn the
-# explicit rule into a pattern rule: we replace info with %, and
-# insert a touch target info/stamp.
-$(patsubst info/%, \%/%, $(ttop) $(tsubj)): %/stamp
-	perl $(srcdir)/info/info.pl
-info/stamp: $(tsrc) info/info.pl
-	>$@
-subjects.mk: $(ttop)
-	:
+# Info formatting
+
+# FIXME Remaking subjects doesn't work correctly when info sources get
+# removed or subjects get dropped.
+
+subjects.mk: info/findsubj.pl $(tsrc)
+	perl $(srcdir)/info/findsubj.pl $(filter %.t, $^)
+
+$(tsubj): info/mksubj.pl
+	perl $(srcdir)/info/mksubj.pl $@ $(filter %.t, $^)
+
+$(ttop): $(tsubj)
+	perl $(srcdir)/info/mktop.pl $@ $(filter %.t, $^)
 
 info.nr/all: $(filter-out info.nr/all, $(info.nr))
-	(cd info.nr && ls -CF) >$@
-# FIXME should use $^ and not ls
+	>$@
+	(cd info.nr && LC_ALL=C ls -C $(info)) >>$@
+
+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
 
-info.html/all.html: $(filter-out info.html/all.html, $(info.html)) info/ls2html.pl
-	(cd info.html && ls -CF *.html) | expand | perl $(filter %.pl, $^) >$@
-# FIXME should use $^ and not ls
+$(subjects.html) info.html/TOP.html: info/subj2html.pl
+$(topics.html): info/emp2html.pl
 
-$(info.nr): info/CRT.MAC info/INFO.MAC info/Blank.awk | info.nr
+info.ps: info/TROFF.MAC info/INFO.MAC $(ttop) $(tsubj) $(tsrc)
+	groff $^ >$@
 
-$(subjects.html): info/subj2html.pl | info.html
-$(topics.html): info/emp2html.pl | info.html
+# List of source files
 
-info.nr info.html lib:
-	mkdir -p $@
+# 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.
 
-ifeq ($(cvs_controlled),yes)
-# Find files and directories under CVS control
-sources.mk: $(scripts)/cvsfiles.awk $(addprefix $(srcdir)/, $(addsuffix CVS/Entries, $(dirs)))
-	echo 'src := ' `cd $(srcdir) && $(AWK) -f src/scripts/cvsfiles.awk` >$@
+ifeq ($(revctrl),git)
+sources.mk:
+	echo "src := $(src)" >sources.mk
+else
+ifneq ($(srcdir),.)
+sources.mk: $(srcdir)/sources.mk
+	cp -f $^ $@
+endif
 endif
 
+# Distributing
+
+.PHONY: dist-source
+dist-source: $(src_distgen) $(bld_distgen)
+	$(tarball) $(TARNAME)-$(VERSION) $(bld_distgen) -C $(srcdir) $(src_distgen) $(src)
+
+.PHONY: dist-client
+dist-client: $(cli_distgen)
+	$(tarball) $(TARNAME)-client-$(VERSION)				\
+	-C $(srcdir)/src/client						\
+		$(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)/man empire.6					\
+	-C $(srcdir) COPYING INSTALL install-sh
+
+.PHONY: dist-info
+dist-info: info html
+	$(tarball) $(TARNAME)-info-text-$(VERSION) -C info.nr $(info)
+	$(tarball) $(TARNAME)-info-html-$(VERSION) -C info.html $(addsuffix .html, $(info))
+
 ifneq ($(deps),)
 -include $(deps)
 endif
 
+
 # Automatic remake of configuration
 # See (autoconf)Automatic Remaking.
 # This requires sufficiently recent versions of autoconf and automake
@@ -223,7 +367,7 @@ $(srcdir)/configure: configure.ac aclocal.m4
 $(srcdir)/config.h.in: stamp-h.in
 $(srcdir)/stamp-h.in: configure.ac aclocal.m4
 	cd $(srcdir) && autoheader
-	>$@
+	touch $@
 
 $(srcdir)/aclocal.m4: $(filter m4/%.m4, $(src))
 	cd $(srcdir) && aclocal -I m4
@@ -239,5 +383,18 @@ GNUmakefile: GNUmakefile.in config.status
 config.status: configure
 	./config.status --recheck
 
-src/lib/global/path.c src/client/ipglob.c: %: %.in GNUmakefile
+src/lib/global/path.c src/client/ipglob.c: %: %.in GNUmakefile Make.mk
 	$(subst.in) <$< >$@
+
+
+# Make files for standalone client distribution
+
+$(srcdir)/src/client/configure: src/client/configure.ac src/client/aclocal.m4
+	cd $(dir $@) && autoconf
+
+$(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 $< $@