X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=Make.mk;h=c16d73b8d978a02c565ae25bead849093c515efd;hp=ba7945979d0b83c64cccf1c87021bcd6d5f71de5;hb=refs%2Fheads%2Fempdump-v4.3.11;hpb=62c8eea544540ab29dcc96c8fa7d6492182a8f8f diff --git a/Make.mk b/Make.mk index ba7945979..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-2007, 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 @@ -25,7 +25,7 @@ # # --- # -# Make.mk: +# Make.mk: The real Makefile, included by GNUmakefile # # Known contributors to this file: # Markus Armbruster, 2005-2007 @@ -46,14 +46,18 @@ all: .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 @@ -63,7 +67,7 @@ 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) $(scripts)/tarball +tarball := $(SHELL) -e $(scripts)/tarball econfig := $(sysconfdir)/empire/econfig schedule := $(sysconfdir)/empire/schedule gamedir := $(localstatedir)/empire @@ -74,7 +78,7 @@ 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 GNUmakefile.?g' \ + -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' \ @@ -98,9 +102,9 @@ obj := $(csrc:.c=.o) $(filter %.o, $(ac:.c=.o)) # 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: @@ -111,17 +115,21 @@ info.nr := $(addprefix info.nr/, $(info)) 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 +libs += lib/libw32.a endif # Cleanliness @@ -140,6 +148,9 @@ cli_distgen := $(acdistcli) # Compiler flags 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 @@ -178,8 +189,10 @@ install: all installdirs 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 \ @@ -208,8 +221,7 @@ uninstall: rm -f $(addprefix $(bindir)/, $(notdir $(client))) rm -rf $(builtindir) $(einfodir) rm -f $(addprefix $(mandir)/man6/, $(notdir $(man6))) - @[ -e $(gamedir) ] && echo "$(gamedir) not removed, you may wish to remove it manually." - @[ -e $(econfig) ] && echo "$(econfig) not removed, you may wish to remove it manually." + @echo "$(dir $(econfig)) and $(gamedir) not removed, you may wish to remove it manually." .PHONY: dist dist: dist-source dist-client dist-info @@ -250,18 +262,23 @@ info.html/%.html: info/%.t # 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)) +$(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): $(AR) rc $@ $? @@ -269,12 +286,11 @@ $(libs) $(empth_lib): # Info formatting -subjects.mk: $(tsrc) info/findsubj.pl sources.mk - perl $(srcdir)/info/findsubj.pl -# If sources.mk is out of date, $(tsrc) is. If it contains files that -# went away, make can't remake subjects.mk. Tell it to ignore such -# missing files: -$(tsrc): +# 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, $^) @@ -283,12 +299,11 @@ $(ttop): $(tsubj) perl $(srcdir)/info/mktop.pl $@ $(filter %.t, $^) info.nr/all: $(filter-out info.nr/all, $(info.nr)) - (cd info.nr && LC_ALL=C ls -C $(info)) >$@ -# FIXME shouldn't use ls + >$@ + (cd info.nr && LC_ALL=C ls -C $(info)) >>$@ -info.html/all.html: $(filter-out info.html/all.html, $(info.html)) info/ls2html.pl - (cd info.html && LC_ALL=C ls -C $(notdir $(info.html))) | expand | perl $(filter %.pl, $^) >$@ -# FIXME shouldn't use ls +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 @@ -300,10 +315,13 @@ info.ps: info/TROFF.MAC info/INFO.MAC $(ttop) $(tsubj) $(tsrc) # List of source files -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 | LC_ALL=C sort` >$@ +# 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 ($(revctrl),git) +sources.mk: + echo "src := $(src)" >sources.mk else ifneq ($(srcdir),.) sources.mk: $(srcdir)/sources.mk @@ -322,7 +340,9 @@ dist-client: $(cli_distgen) $(tarball) $(TARNAME)-client-$(VERSION) \ -C $(srcdir)/src/client \ $(notdir $(filter src/client/%, $(src)) $(cli_distgen)) \ - -C $(srcdir)/include proto.h \ + -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