X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=Make.mk;h=545eb0b5a0d455b9508a57b693fb6dd31915cb6f;hp=ac107263c36b049045e228ae7d6c424ed00a8705;hb=refs%2Fheads%2Fhvy-plastic-3;hpb=4ea4a01fd524099ba40ba667c7157ce722489252 diff --git a/Make.mk b/Make.mk index ac107263c..545eb0b5a 100644 --- a/Make.mk +++ b/Make.mk @@ -1,102 +1,187 @@ -# +# # Empire - A multi-player, client/server Internet based war game. -# Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak, -# Ken Stevens, Steve McClure -# -# This program is free software; you can redistribute it and/or modify +# Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak, +# Ken Stevens, Steve McClure, Markus Armbruster +# +# Empire 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 +# the Free Software Foundation, either version 3 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 -# +# along with this program. If not, see . +# # --- -# -# 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-2011 +# # This makefile was inspired by `Recursive Make Considered Harmful', # Peter Miller, 1997. -# http://www.pcug.org.au/~millerp/rmch/recu-make-cons-harm.html +# http://miller.emu.id.au/pmiller/books/rmch/ # Recursively expanded variables are occasionally useful, but can be # 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 +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 + +# Abbreviate make output +# Run make with a V=1 parameter for full output. +ifneq ($(origin V),command line) +V:= +endif +# $(call quiet-command COMMAND,ABBREV) runs COMMAND, but prints only ABBREV. +# Recursively expanded so that variables in COMMAND and ABBREV work. +ifneq ($V$(findstring s,$(MAKEFLAGS)),) +quiet-command = $1 +else +quiet-command = @echo $2 && $1 +endif + +# 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 +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))) +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) +# Library archives: 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 +# 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))) +info.all := $(info.nr) $(info.html) info.ps -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 +$(client): 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.all) $(empth_obj) $(empth_lib) +# Removed by distclean: +distclean := $(ac) $(mk) +# Distributed by dist-source from $(srcdir): +src_distgen := $(acdist) +# Distributed by dist-client from $(srcdir)/src/client; removed by distclean: +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 +CFLAGS += -Wall -W -Wno-unused-parameter -Wpointer-arith \ +-Wstrict-prototypes -Wmissing-prototypes -Wnested-externs \ +-Wredundant-decls endif -LDLIBS += -lm +$(client): LDLIBS := $(LIBS_client) +$(server): LDLIBS := $(LIBS_server) ### Advertized goals .PHONY: all -all: $(progs) info +all: $(util) $(client) $(server) info .PHONY: info html info: $(info.nr) @@ -104,25 +189,60 @@ html: $(info.html) .PHONY: clean clean: - rm -f $(clean) + $(call quiet-command,rm -f $(clean),CLEAN) .PHONY: distclean distclean: clean - rm -rf $(distclean) - -.PHONY: install install-html -install: all - false # FIXME + $(call quiet-command,rm -rf $(distclean) $(cli_distgen),DISTCLEAN) + +.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 @@ -131,20 +251,29 @@ dist: # addition to %.o. ifeq ($(how_to_dep),fast) %.o: %.c - $(COMPILE.c) -MT $@ -MMD -MP $(OUTPUT_OPTION) $< + $(call quiet-command,$(COMPILE.c) -MT $@ -MMD -MP -MF $(@:.o=.d) \ + $(OUTPUT_OPTION) $< || { rm -f $(@:.o=.d) $@; false; },CC $@) +# 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 - source='$<' object='$@' depfile='$(@:.o=.d)' $(CCDEPMODE) $(depcomp) \ - $(COMPILE.c) $(OUTPUT_OPTION) $< + $(call quiet-command,source='$<' object='$@' depfile='$(@:.o=.d)' \ + $(CCDEPMODE) $(depcomp) $(COMPILE.c) $(OUTPUT_OPTION) $<,CC $@) endif # Cancel the rule to compile %.c straight to %, it interferes with # automatic dependency generation %: %.c +%$(EXEEXT): %.o + $(call quiet-command,$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@,LINK $@) + + info.nr/%: info/%.t - $(NROFF) -I $(srcdir)/info $(filter %/CRT.MAC, $^) $< | $(AWK) -f $(filter %/Blank.awk, $^) >$@ -# FIXME AT&T nroff doesn't grok -I + $(call quiet-command,$(NROFF) $(filter %.MAC, $^) $< | $(AWK) -f $(filter %/Blank.awk, $^) >$@ && test -s $@,NROFF $@) +# Pipes in make are a pain. The "test -s" catches obvious errors. info.html/%.html: info/%.t perl $(filter %.pl, $^) $< >$@ @@ -152,11 +281,13 @@ 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) - $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@ +# Compilation -src/client/empire: $(filter src/client/%, $(obj)) $(termlibs) - $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@ +$(server): $(filter src/server/% src/lib/commands/% src/lib/player/% src/lib/subs/% src/lib/update/%, $(obj)) $(empth_obj) $(empth_lib) $(libs) + $(call quiet-command,$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@,LINK $@) + +$(client): $(filter src/client/%, $(obj)) src/lib/global/version.o + $(call quiet-command,$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@,LINK $@) $(util): $(libs) @@ -164,54 +295,73 @@ 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 - $(AR) rc $@ $? +$(libs) $(empth_lib): + $(call quiet-command,$(AR) rc $@ $?,AR $@) $(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.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 +$(info.nr): info/CRT.MAC info/INFO.MAC info/Blank.awk -$(info.nr): info/CRT.MAC info/INFO.MAC info/Blank.awk | info.nr +$(subjects.html) info.html/TOP.html: info/subj2html.pl +$(topics.html): info/emp2html.pl -$(subjects.html): info/subj2html.pl | info.html -$(topics.html): info/emp2html.pl | info.html +info.ps: info/TROFF.MAC info/INFO.MAC $(ttop) $(tsubj) $(tsrc) + groff $^ >$@ -info.nr info.html lib: - mkdir -p $@ +# Distributing -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` >$@ +.PHONY: dist-source +dist-source: $(src_distgen) +ifeq ($(revctrl),git) + echo "src := $(src)" >$(srcdir)/sources.mk endif + $(tarball) $(TARNAME)-$(VERSION) -C $(srcdir) $(src_distgen) $(src) sources.mk + +.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 $(addprefix w32/, $(client/w32)) \ + -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)) + +# Dependencies ifneq ($(deps),) -include $(deps) endif + # Automatic remake of configuration # See (autoconf)Automatic Remaking. # This requires sufficiently recent versions of autoconf and automake @@ -223,7 +373,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 +389,18 @@ GNUmakefile: GNUmakefile.in config.status config.status: configure ./config.status --recheck -src/lib/global/path.c src/client/ipglob.c: %: %.in GNUmakefile - $(subst.in) <$< >$@ +src/lib/global/path.c src/client/ipglob.c: %: %.in GNUmakefile Make.mk + $(call quiet-command,$(subst.in) <$< >$@,GEN $@) + + +# 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 m4/my_terminfo.m4 m4/my_windows_api.m4 + cat $^ >$@