makefile cleanup, todo add

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-03-25 19:39:50 +01:00
parent 58391818cc
commit bd25d6810b
2 changed files with 14 additions and 6 deletions

View File

@ -69,6 +69,7 @@ all:
@echo 'Here are the possible targets:' @echo 'Here are the possible targets:'
@echo '' @echo ''
@echo ' man: Build manpages (requires Asciidoc)' @echo ' man: Build manpages (requires Asciidoc)'
@echo ' manhtml: Build html-manpages (requires Asciidoc)'
@echo ' clean: Remove build stuff' @echo ' clean: Remove build stuff'
@echo '' @echo ''
@echo '' @echo ''
@ -83,7 +84,7 @@ $(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR):
mkdir -p $@ mkdir -p $@
# Link source files # Link source files
manlink: $(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR) manlink: $(MAN1SRC) $(MAN7SRC) $(MANTYPE7SRC) $(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR)
for mansrc in $(MAN1SRC); do ln -sf ../../../$$mansrc $(MAN1DSTDIR); done for mansrc in $(MAN1SRC); do ln -sf ../../../$$mansrc $(MAN1DSTDIR); done
for mansrc in $(MAN7SRC); do ln -sf ../../../$$mansrc $(MAN7DSTDIR); done for mansrc in $(MAN7SRC); do ln -sf ../../../$$mansrc $(MAN7DSTDIR); done
for mansrc in $(MAN7TYPESRC); do \ for mansrc in $(MAN7TYPESRC); do \
@ -93,14 +94,14 @@ manlink: $(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR)
%.1 %.7: %.text manlink %.1 %.7: %.text manlink
$(A2XM) $*.text $(A2XM) $*.text
%.html: %.text %.html: %.text manlink
$(A2XH) -o $(MANHTMLDIR)/$(@F) $< $(A2XH) -o $(MANHTMLDIR)/$(@F) $<
man: $(MAN1DST) $(MAN7DST) $(MAN7TYPEDST) man: $(MAN1DST) $(MAN7DST) $(MAN7TYPEDST)
html: $(MANHTML) # $(MANHTML): $(MANHTMLDIR)
manhtml: $(MANHTML)
# Reference depends on conf/type/*/man.text - HOWTO with posix make?
$(MANDIR)/cdist-reference.text: $(MANDIR)/cdist-reference.text.sh $(MANDIR)/cdist-reference.text: $(MANDIR)/cdist-reference.text.sh
$(MANDIR)/cdist-reference.text.sh $(MANDIR)/cdist-reference.text.sh
$(A2XM) $(MANDIR)/cdist-reference.text $(A2XM) $(MANDIR)/cdist-reference.text
@ -109,7 +110,7 @@ $(MANDIR)/cdist-reference.text: $(MANDIR)/cdist-reference.text.sh
clean: clean:
rm -rf doc/man/html/* doc/man/*.[1-9] doc/man/man[1-9] rm -rf doc/man/html/* doc/man/*.[1-9] doc/man/man[1-9]
rm -f conf/type/*/man.html $(MANDIR)/cdist-reference.text rm -f conf/type/*/man.html $(MANDIR)/cdist-reference.text
rm -rf $(MANHTMLDIR) rm -rf $(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR)
################################################################################ ################################################################################
# Developer targets # Developer targets

View File

@ -1,7 +1,14 @@
UNASSIGNED TODOS
----------------
The following list of todos has not been assigned to any developer. The following list of todos has not been assigned to any developer.
Feel free to pick one!
Feel free to pick one: CORE
----
Only build manpages if necessary for types as well as for the core!
TYPES
------
Types to be written/extended: Types to be written/extended:
- __ssh-keys (host/user) - __ssh-keys (host/user)
- Think about __service - necessary? - Think about __service - necessary?