jfut
/
ccollect
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

begin makefile cleanup 

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-01-15 02:31:29 +01:00
parent 8c376a31f5
commit 51db5e1204
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Makefile
View File

@ -22,8 +22,8 @@
# #
INSTALL=install INSTALL=install
CCOLLECT_SOURCE=ccollect.sh CCOLLECT_SOURCE=ccollect
CCOLLECT_DEST=ccollect.sh CCOLLECT_DEST=ccollect
LN=ln -sf LN=ln -sf
ASCIIDOC=asciidoc ASCIIDOC=asciidoc
DOCBOOKTOTEXI=docbook2x-texi DOCBOOKTOTEXI=docbook2x-texi
@ -116,20 +116,28 @@ install-manlink: install-man
# #
# Tools # Tools
# #
TOOLS=ccollect_add_source.sh \ TOOLS2=ccollect_add_source
ccollect_analyse_logs.sh \ TOOLS2 += ccollect_analyse_logs
ccollect_delete_source.sh \
ccollect_list_intervals.sh \
ccollect_logwrapper.sh \
ccollect_list_intervals.sh
TOOLSMAN1 = $(subst ccollect,doc/man/ccollect,$(TOOLS)) TOOLS=ccollect_add_source \
TOOLSMAN = $(subst .sh,.text,$(TOOLSMAN1)) ccollect_analyse_logs \
ccollect_delete_source \
ccollect_list_intervals \
ccollect_logwrapper \
ccollect_list_intervals
# Stick to posix
TOOLSMAN1 = $(TOOLS:ccollect=doc/man/ccollect)
TOOLSMAN = $(TOOLSMAN1:=.text)
TOOLSFP = $(subst ccollect,tools/ccollect,$(TOOLS)) TOOLSFP = $(subst ccollect,tools/ccollect,$(TOOLS))
## FIXME: posix make: shell? =>
t2: t2:
echo $(TOOLS) - $(TOOLSMAN) - $(TOOLSFP) echo $(TOOLS) - $(TOOLSFP)
echo $(TOOLSMAN)
echo $(TOOLSFP)
# docbook gets .htm, asciidoc directly .html # docbook gets .htm, asciidoc directly .html
@ -191,9 +199,9 @@ dist: distclean documentation
/tmp/ccollect: /tmp/ccollect:
mkdir -p /tmp/ccollect mkdir -p /tmp/ccollect
test: ccollect.sh /tmp/ccollect test: $(CCOLLECT_SOURCE) /tmp/ccollect
cd ./conf/sources/; for s in *; do CCOLLECT_CONF=../ ../../ccollect.sh daily "$$s"; done cd ./conf/sources/; for s in *; do CCOLLECT_CONF=../ ../../ccollect daily "$$s"; done
touch /tmp/ccollect/$$(ls /tmp/ccollect | head -n1).ccollect-marker touch /tmp/ccollect/$$(ls /tmp/ccollect | head -n1).ccollect-marker
CCOLLECT_CONF=./conf ./ccollect.sh -a daily CCOLLECT_CONF=./conf ./ccollect -a daily
touch /tmp/ccollect/$$(ls /tmp/ccollect | head -n1).ccollect-marker touch /tmp/ccollect/$$(ls /tmp/ccollect | head -n1).ccollect-marker
CCOLLECT_CONF=./conf ./ccollect.sh -a -p daily CCOLLECT_CONF=./conf ./ccollect -a -p daily