diff options
Diffstat (limited to 'rcynic')
| -rw-r--r-- | rcynic/Makefile.in | 54 | ||||
| -rw-r--r-- | rcynic/rcynic-html.py | 8 |
2 files changed, 35 insertions, 27 deletions
diff --git a/rcynic/Makefile.in b/rcynic/Makefile.in index 3b86a510..a8994a2c 100644 --- a/rcynic/Makefile.in +++ b/rcynic/Makefile.in @@ -16,18 +16,21 @@ LDFLAGS = @LDFLAGS@ @LD_STATIC_FLAG@ LIBS = @LIBS@ AWK = @AWK@ -XSLTPROC = @XSLTPROC@ +PYTHON = @PYTHON@ +RRDTOOL = @RRDTOOL@ abs_top_srcdir = @abs_top_srcdir@ abs_top_builddir = @abs_top_builddir@ host_os = @host_os@ -all: ${BIN} +SCRIPTS = rcynic-text rcynic-html + +all: ${BIN} ${SCRIPTS} clean: cd static-rsync; ${MAKE} $@ - rm -f ${BIN} ${OBJS} ${GEN} + rm -f ${BIN} ${OBJS} ${GEN} ${SCRIPTS} ${OBJ}: ${SRC} ${HDR} ${GEN} @@ -38,7 +41,15 @@ defstack.h: defstack.awk ${SRC} ${HDR} ${AWK} -f >$@ defstack.awk ${SRC} ${HDR} test: ${BIN} - if test -r rcynic.conf; then ./${BIN} -j 0 && echo && ./show.sh; else echo No rcynic.conf, skipping test; fi + if test -r rcynic.conf; \ + then \ + ./${BIN} -j 0 && \ + test -r rcynic.xml && \ + echo && \ + ./rcynic-text rcynic.xml; \ + else \ + echo No rcynic.conf, skipping test; \ + fi install: ${BIN} installation-scripts/install.sh cd installation-scripts; host_os="${host_os}"; DESTDIR="${DESTDIR}"; . ./install.sh @@ -46,32 +57,23 @@ install: ${BIN} installation-scripts/install.sh uninstall deinstall: cd installation-scripts; host_os="${host_os}"; DESTDIR="${DESTDIR}"; . ./deinstall.sh -distclean: clean docclean +distclean: clean cd static-rsync; ${MAKE} $@ rm -f show.sh installation-scripts/linux/install.sh Makefile -tags: TAGS - -TAGS: ${SRC} ${HDR} ${GEN} - etags ${SRC} ${HDR} ${GEN} - -rcynic.html: rcynic.xml rcynic.xsl - ${XSLTPROC} -o $@ rcynic.xsl rcynic.xml +COMPILE_PYTHON = \ + AC_PYTHON_INTERPRETER='${PYTHON}' \ + AC_RRDTOOL_BINARY='${RRDTOOL}' \ + ${PYTHON} ${abs_top_srcdir}/buildtools/make-rcynic-script.py <$? >$@; \ + chmod 755 $@ -# Doc stuff right now is just internals doc, of interest only to -# programmers. Real doc for rcynic is still the README. This may -# change some day. +rcynic-text: rcynic-text.py + ${COMPILE_PYTHON} -html: - TZ='' doxygen +rcynic-html: rcynic-html.py + ${COMPILE_PYTHON} -pdf: html - cd doc/latex && TZ='' ${MAKE} pdf && ln -f refman.pdf ../manual.pdf - -tgz: html - cd doc && tar -cf - html | gzip -9 >manual.tar.gz - -docs: html pdf tgz +tags: TAGS -docclean: - rm -rf doc +TAGS: ${SRC} ${HDR} ${GEN} + etags ${SRC} ${HDR} ${GEN} diff --git a/rcynic/rcynic-html.py b/rcynic/rcynic-html.py index 1f22374d..ea28ab18 100644 --- a/rcynic/rcynic-html.py +++ b/rcynic/rcynic-html.py @@ -40,13 +40,19 @@ opt = { "show-problems" : False, "show-graphs" : True, "update-rrds" : True, - "rrdtool-binary" : "rrdtool", "suckerfish-javascript" : False, "png-height" : 190, "png-width" : 1350, "svg-height" : 600, "svg-width" : 1200 } +try: + # Set from autoconf + opt["rrdtool-binary"] = ac_rrdtool_binary +except NameError: + # Not set at all + opt["rrdtool-binary"] = "rrdtool" + def usage(msg = 0): f = sys.stderr if msg else sys.stdout f.write("Usage: %s %s [options] input_file output_directory\n" % (sys.executable, sys.argv[0])) |