Cosmetics.

diff --git a/Make.mk b/Make.mk
index ed42e075669843ccb5f65a331808d4a3ec26fd3e..f62a493c6f7522897f1644a8cd4cc0f5decd0db6 100644 (file)
--- 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' \
 # 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
        -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
 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
 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)
 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
 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)
 deps := $(obj:.o=.d)

+# Library archives:

 libs := $(addprefix lib/, libcommon.a libgen.a libglobal.a)
 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)
 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
 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)))
 
 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
 ifeq ($(empthread),LWP)
 empth_obj := src/lib/empthread/lwp.o
 empth_lib := lib/liblwp.a