From a30b32e98724e028edd93dea70353138fd13940d Mon Sep 17 00:00:00 2001 From: Janos Kovacs Date: Mon, 23 Apr 2012 06:44:18 +0300 Subject: [PATCH] documentation: fixing some bugs to get the first version work --- doc/Makefile.am | 2 +- doc/plugin-developer-guide/db/Makefile.am | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 2582da2..7e0a4d9 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -14,7 +14,7 @@ endif SUBDIRS = $(DOCDIRS) -doc_DATA = CODING-STYLE $(DOCFILES) +doc_DATA = CODING-STYLE # $(DOCFILES) all-am: $(TARGETS) diff --git a/doc/plugin-developer-guide/db/Makefile.am b/doc/plugin-developer-guide/db/Makefile.am index d95e2fb..2289dc4 100644 --- a/doc/plugin-developer-guide/db/Makefile.am +++ b/doc/plugin-developer-guide/db/Makefile.am @@ -5,13 +5,11 @@ vpath %.lyx ../lyx include $(MRP_MAKE_DOCRULES) - FIGURES_SVG = db-layers.svg FIGURES_PNG = $(FIGURES_SVG:.svg=.png) FIGURES_PDF = $(FIGURES_SVG:.svg=.pdf) -FIGURES = copy_svgs $(FIGURES_PNG) $(FIGURES_PDF) -FIGURE_FILES = $(FIGURES_SVG) $(FIGURES_PNG) $(FIGURES_PDF) +FIGURES = $(FIGURES_SVG) $(FIGURES_PNG) $(FIGURES_PDF) LYX_DOCS = murphy-db.lyx XML_DOCS = $(LYX_DOCS:.lyx=.xml) @@ -23,8 +21,14 @@ TARGETS = $(FIGURES) plugin-developer-guide.xml all-am: $(TARGETS) -copy_svgs: $(FIGURES_SVG) - for file in $^ ; do cp $(MRP_FIGDIR)/$$file . ; done +figures: $(FIGURES_SVG) + for svg in $^ ; do \ + pdf=`basename($${svg/.svg/.pdf})` ; \ + png=$${pdf/.pdf/.png} ; \ + cp $$svg . ; \ + $(MRP_INKSCAPE) --export-area-drawing --export-pdf=$$pdf $$svg ; \ + ${MRP_INKSCAPE) --export-area-drawing --export-png=$$png $$svg ; \ + done $(MQL_GRAMMAR): $(TOP_SRCDIR)/murphy-db/mql/mql-scanner.l \ $(TOP_SRCDIR)/murphy-db/mql/mql-parser.y @@ -49,5 +53,5 @@ plugin-developer-guide.xml: plugin-developer-guide.lyx \ rm -f ../lyx/plugin-devloper-guide.xml clean-local: - rm -f $(TARGETS) $(FIGURES_SVG) $(GENERATED_GRAMMARS) $(XML_DOCS) \ + rm -f $(TARGETS) $(FIGURES) $(GENERATED_GRAMMARS) $(XML_DOCS) \ ../lyx/*.xml -- 2.7.4