empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reorder variable definitions. No functional changes.

Browse source
This commit is contained in:
Markus Armbruster 2006-01-15 18:15:50 +00:00
parent 99975ef076
commit 0280a43950
1 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Make.mk
View file

@ -55,8 +55,26 @@ man6 := $(filter man/%.6, $(src))
# Info topics and subjects # Info topics and subjects
-include subjects.mk -include subjects.mk
# Abbreviations
topics := $(patsubst %.t,%,$(notdir $(tsrc))) topics := $(patsubst %.t,%,$(notdir $(tsrc)))
info := $(topics) $(subjects) all TOP 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
econfig := $(sysconfdir)/empire/econfig
edatadir := $(localstatedir)/empire
einfodir := $(datadir)/empire/info.nr
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/@EMPIREPORT\@/$(EMPIREPORT)/g'
# Generated files # Generated files
mk := sources.mk subjects.mk mk := sources.mk subjects.mk
@ -69,12 +87,9 @@ libs := $(addprefix lib/, libcommon.a libgen.a libglobal.a)
util := $(addprefix src/util/, $(addsuffix $(EXEEXT), fairland files pconfig)) util := $(addprefix src/util/, $(addsuffix $(EXEEXT), fairland files pconfig))
client := src/client/empire$(EXEEXT) client := src/client/empire$(EXEEXT)
server := src/server/emp_server$(EXEEXT) server := src/server/emp_server$(EXEEXT)
progs := $(util) $(client) $(server)
tsubj := $(addprefix info/, $(addsuffix .t, $(subjects))) tsubj := $(addprefix info/, $(addsuffix .t, $(subjects)))
ttop := info/TOP.t ttop := info/TOP.t
info.nr := $(addprefix info.nr/, $(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.html := $(addprefix info.html/, $(addsuffix .html, $(info)))
ifeq ($(empthread),LWP) ifeq ($(empthread),LWP)
@ -90,24 +105,9 @@ empth_obj := src/lib/empthread/ntthread.o
empth_lib := empth_lib :=
endif endif
# Abbreviations clean := $(obj) $(deps) $(libs) $(util) $(client) $(server) \
scripts = $(srcdir)/src/scripts $(empth_lib) $(tsubj) $(ttop) $(info.nr) $(info.html)
depcomp = $(SHELL) $(srcdir)/depcomp
clean := $(obj) $(deps) $(libs) $(progs) $(empth_lib) $(tsubj) \
$(ttop) $(info.nr) $(info.html)
distclean := $(ac) distclean := $(ac)
econfig := $(sysconfdir)/empire/econfig
edatadir := $(localstatedir)/empire
einfodir := $(datadir)/empire/info.nr
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/@EMPIREPORT\@/$(EMPIREPORT)/g'
# Compiler flags # Compiler flags
CPPFLAGS += -I$(srcdir)/include -I. CPPFLAGS += -I$(srcdir)/include -I.
@ -121,7 +121,7 @@ LDLIBS += -lm
### Advertized goals ### Advertized goals
.PHONY: all .PHONY: all
all: $(progs) info all: $(util) $(client) $(server) info
.PHONY: info html .PHONY: info html
info: $(info.nr) info: $(info.nr)