From: Markus Armbruster Date: Thu, 26 Jan 2006 18:44:39 +0000 (+0000) Subject: Cosmetics. X-Git-Tag: PZ5~127 X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=14250e3cbcc52cae1c396af7cf4ffa5d998fca74 Cosmetics. --- diff --git a/Make.mk b/Make.mk index ed42e0756..f62a493c6 100644 --- a/Make.mk +++ b/Make.mk @@ -73,32 +73,42 @@ ehtmldir := $(datadir)/empire/info.html # Recursively expanded so that $@ and $< work. subst.in = sed \ -e 's?@configure_input\@?$(notdir $@). Generated from $(notdir $<) by GNUmakefile.?g' \ - -e 's?@econfig\@?$(econfig)?g' \ - -e 's?@edatadir\@?$(edatadir)?g' \ - -e 's?@einfodir\@?$(einfodir)?g' \ - -e 's/@EMPIREHOST\@/$(EMPIREHOST)/g' \ + -e 's?@econfig\@?$(econfig)?g' \ + -e 's?@edatadir\@?$(edatadir)?g' \ + -e 's?@einfodir\@?$(einfodir)?g' \ + -e 's/@EMPIREHOST\@/$(EMPIREHOST)/g' \ -e 's/@EMPIREPORT\@/$(EMPIREPORT)/g' # Generated files # See `Cleanliness' below -mk := sources.mk subjects.mk +# sources.mk subjects.mk +# Generated by Autoconf, not distributed: ac := config.h config.log config.status 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) +# Programs: util := $(addprefix src/util/, $(addsuffix $(EXEEXT), 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)) info.html := $(addprefix info.html/, $(addsuffix .html, $(info))) +# Conditionally generated files: ifeq ($(empthread),LWP) empth_obj := src/lib/empthread/lwp.o empth_lib := lib/liblwp.a