From 62379ff8fdb13d95c7651419d92db47150e15bcc Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Wed, 22 Jan 2014 21:16:52 +0100 Subject: Fixes for missing build dependencies --- Makefile.in | 13 +------------ addon/doxysearch/Makefile.in | 2 -- addon/doxywizard/Makefile.in | 5 ----- qtools/Makefile.in | 2 -- src/Makefile.in | 9 --------- src/docbookgen.cpp | 12 ------------ src/doxygen.pro.in | 1 + src/libdoxycfg.pro.in | 4 ++-- src/libdoxygen.pro.in | 39 ++++----------------------------------- src/libdoxygen.t.in | 20 +++++++++++--------- 10 files changed, 19 insertions(+), 88 deletions(-) diff --git a/Makefile.in b/Makefile.in index f1d4b72..f9e3b97 100644 --- a/Makefile.in +++ b/Makefile.in @@ -49,7 +49,7 @@ distclean: clean -rm -f libmd5/Makefile.libmd5 -rm -f .makeconfig .tmakeconfig -rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro - -rm -f generated_src/doxygen/version.cpp + -rm -f generated_src/* -rm -f addon/doxywizard/doxywizard.pro -rm -f VERSION -rm -f packages/rpm/doxygen.spec @@ -62,17 +62,6 @@ distclean: clean -rm -f qtools/Makefile src/Makefile examples/Makefile doc/Makefile -rm -f Makefile -realclean: clean - -cd src ; $(MAKE) realclean - -cd libmd5 ; $(MAKE) realclean - -cd addon/doxywizard ; $(MAKE) realclean - -cd addon/doxysearch ; $(MAKE) realclean - -cd addon/doxyapp ; $(MAKE) realclean - -cd addon/doxmlparser/src ; $(MAKE) realclean - -cd addon/doxmlparser/test ; $(MAKE) realclean - -cd addon/doxmlparser/examples/metrics ; $(MAKE) realclean - -$(MAKE) distclean - DATE=$(shell date "+%B %Y") MAN1DIR = man/man1 diff --git a/addon/doxysearch/Makefile.in b/addon/doxysearch/Makefile.in index f3ed662..7daafee 100644 --- a/addon/doxysearch/Makefile.in +++ b/addon/doxysearch/Makefile.in @@ -7,8 +7,6 @@ distclean: clean $(RM) -rf Makefile doxysearch.pro Makefile.doxysearch $(RM) -rf Makefile doxyindexer.pro Makefile.doxyindexer -realclean: distclean - tmake: $(ENV) $(PERL) "$(TMAKE)" doxysearch.pro >Makefile.doxysearch $(ENV) $(PERL) "$(TMAKE)" doxyindexer.pro >Makefile.doxyindexer diff --git a/addon/doxywizard/Makefile.in b/addon/doxywizard/Makefile.in index 8cafb9e..149da22 100644 --- a/addon/doxywizard/Makefile.in +++ b/addon/doxywizard/Makefile.in @@ -29,11 +29,6 @@ distclean: Makefile.doxywizard $(MAKE) -f Makefile.doxywizard distclean $(RM) Makefile.doxywizard -realclean: Makefile.doxywizard - $(RM) ../../generated_src/doxywizard/configdoc.cpp - $(RM) ../../generated_src/doxywizard/config_doxyw.cpp - $(MAKE) distclean - install: $(INSTTOOL) -d $(INSTALL)/bin $(INSTTOOL) -m 755 ../../bin/doxywizard $(INSTALL)/bin diff --git a/qtools/Makefile.in b/qtools/Makefile.in index c8e1f5a..ca66cc1 100644 --- a/qtools/Makefile.in +++ b/qtools/Makefile.in @@ -27,6 +27,4 @@ clean: Makefile.qtools distclean: clean -realclean: distclean - FORCE: diff --git a/src/Makefile.in b/src/Makefile.in index 9d86213..fdfb3a0 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -51,13 +51,4 @@ distclean: clean vhdlscanner.cpp vhdlcode.cpp tclscanner.cpp vhdlparser.h \ vhdlparser.cpp -# clean also the generated files which are in SVN -realclean: distclean - -cd $(GENERATED_SRC) && $(RM) index.xsd.h compound.xsd.h layout_default.xml.h \ - header.html.h footer.html.h search_functions.php.h search_opensearch.php.h \ - search.js.h search.css.h doxygen.css.h navtree.js.h resize.js.h \ - doxygen.sty.h jquery_fx.js.h jquery_p1.js.h jquery_p2.js.h \ - jquery_p3.js.h jquery_ui.js.h navtree.css.h svgpan.js.h dynsections.js.h \ - doxygen.bst.h bib2xhtml.pl.h ../generated_src/doxygen/configoptions.cpp jquery_pt.js.h extsearch.js.h - FORCE: diff --git a/src/docbookgen.cpp b/src/docbookgen.cpp index 47d3b98..93ef8d8 100644 --- a/src/docbookgen.cpp +++ b/src/docbookgen.cpp @@ -56,18 +56,6 @@ //------------------ -static const char index_xsd[] = -#include "index.xsd.h" -; - -//------------------ -// -static const char compound_xsd[] = -#include "compound.xsd.h" -; - -//------------------ - class DocbookSectionMapper : public QIntDict { public: diff --git a/src/doxygen.pro.in b/src/doxygen.pro.in index f6b7763..506a3e8 100644 --- a/src/doxygen.pro.in +++ b/src/doxygen.pro.in @@ -28,6 +28,7 @@ win32-borland:TMAKE_LFLAGS += -L..\lib -L$(BCB)\lib\psdk win32:TMAKE_CXXFLAGS += -DQT_NODLL win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -liconv -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%% -Wl,--as-needed -lole32 win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti +DEPENDPATH += ../generated_src/doxygen INCLUDEPATH += ../qtools ../libmd5 . DESTDIR = ../bin TARGET = doxygen diff --git a/src/libdoxycfg.pro.in b/src/libdoxycfg.pro.in index 5bd3e1e..a8f38c1 100644 --- a/src/libdoxycfg.pro.in +++ b/src/libdoxycfg.pro.in @@ -20,8 +20,8 @@ HEADERS = config.h configoptions.h portable.h SOURCES = ../generated_src/doxygen/config.cpp ../generated_src/doxygen/configoptions.cpp portable.cpp portable_c.c win32:TMAKE_CXXFLAGS += -DQT_NODLL win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti -INCLUDEPATH += . ../qtools -win32:INCLUDEPATH += . +DEPENDPATH += ../generated_src/doxygen +INCLUDEPATH += ../generated_src/doxygen . ../qtools DESTDIR = ../lib TARGET = doxycfg OBJECTS_DIR = ../objects/doxygen diff --git a/src/libdoxygen.pro.in b/src/libdoxygen.pro.in index 573d7c5..b441b96 100644 --- a/src/libdoxygen.pro.in +++ b/src/libdoxygen.pro.in @@ -119,32 +119,6 @@ HEADERS = arguments.h \ xmlgen.h \ docbookvisitor.h \ docbookgen.h \ - ../generated_src/doxygen/bib2xhtml.pl.h \ - ../generated_src/doxygen/compound.xsd.h \ - ../generated_src/doxygen/doxygen.bst.h \ - ../generated_src/doxygen/doxygen.css.h \ - ../generated_src/doxygen/doxygen.sty.h \ - ../generated_src/doxygen/footer.html.h \ - ../generated_src/doxygen/header.html.h \ - ../generated_src/doxygen/index.xsd.h \ - ../generated_src/doxygen/settings.h \ - ../generated_src/doxygen/jquery_p1.js.h \ - ../generated_src/doxygen/jquery_p2.js.h \ - ../generated_src/doxygen/jquery_p3.js.h \ - ../generated_src/doxygen/jquery_ui.js.h \ - ../generated_src/doxygen/jquery_fx.js.h \ - ../generated_src/doxygen/jquery_pt.js.h \ - ../generated_src/doxygen/svgpan.js.h \ - ../generated_src/doxygen/dynsections.js.h \ - ../generated_src/doxygen/layout_default.xml.h \ - ../generated_src/doxygen/navtree.css.h \ - ../generated_src/doxygen/navtree.js.h \ - ../generated_src/doxygen/resize.js.h \ - ../generated_src/doxygen/search.css.h \ - ../generated_src/doxygen/search.js.h \ - ../generated_src/doxygen/extsearch.js.h \ - ../generated_src/doxygen/search_functions.php.h \ - ../generated_src/doxygen/search_opensearch.php.h SOURCES = arguments.cpp \ cite.cpp \ @@ -242,19 +216,14 @@ SOURCES = arguments.cpp \ ../generated_src/doxygen/fortranscanner.cpp \ ../generated_src/doxygen/version.cpp -win32:TMAKE_CXXFLAGS += -DQT_NODLL +win32:TMAKE_CXXFLAGS += -DQT_NODLL win32-msvc:TMAKE_CXXFLAGS += -Zm200 win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -linux-g++:TMAKE_CXXFLAGS += -fno-exceptions -INCLUDEPATH += ../generated_src/doxygen -INCLUDEPATH += ../src -INCLUDEPATH += ../qtools -#INCLUDEPATH += ../libpng -INCLUDEPATH += ../libmd5 +linux-g++:TMAKE_CXXFLAGS += -fno-exceptions +INCLUDEPATH += ../generated_src/doxygen ../src ../qtools ../libmd5 INCLUDEPATH += %%SQLITE3_INC%% +DEPENDPATH += ../generated_src/doxygen win32:INCLUDEPATH += . -#win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5 -win32-g++:INCLUDEPATH = ../generated_src/doxygen ../src ../qtools ../libmd5 DESTDIR = ../lib TARGET = doxygen OBJECTS_DIR = ../objects/doxygen diff --git a/src/libdoxygen.t.in b/src/libdoxygen.t.in index 8e403c8..7dfc906 100644 --- a/src/libdoxygen.t.in +++ b/src/libdoxygen.t.in @@ -26,7 +26,7 @@ GENERATED_OBJ = ../objects/doxygen #${ sub GenerateDep { - my($obj,$src,$dep) = @_; + my($obj,$src,@deps) = @_; my(@objv,$srcv,$i,$s,$o,$d,$c); @objv = split(/\s+/,$obj); @srcv = split(/\s+/,$src); @@ -35,7 +35,9 @@ sub GenerateDep { $o = $objv[$i]; next if $s eq ""; $text .= $o . ": " . $s; - $text .= " ${linebreak}\n\t\t" . $dep if $dep ne ""; + foreach my $dep (@deps) { + $text .= " ${linebreak}\n\t\t" . $dep if $dep ne ""; + } if ( $moc_output{$s} ne "" ) { $text .= " ${linebreak}\n\t\t" . $moc_output{$s}; } @@ -121,19 +123,19 @@ sub GenerateLex { TO_C_CMD=$(PYTHON) to_c_cmd.py < $< > $@ -#$ GenerateDep("\$(GENERATED_OBJ)/layout.o","layout.cpp","\$(GENERATED_SRC)/layout_default.xml.h"); +#$ GenerateDep("layout.cpp","\$(GENERATED_SRC)/layout_default.xml.h"); -#$ GenerateDep("\$(GENERATED_OBJ)/cite.o","cite.cpp","\$(GENERATED_SRC)/doxygen.bst.h","\$(GENERATED_SRC)/bib2xhtml.pl.h"); +#$ GenerateDep("cite.cpp","\$(GENERATED_SRC)/doxygen.bst.h","\$(GENERATED_SRC)/bib2xhtml.pl.h"); -#$ GenerateDep("\$(GENERATED_OBJ)/ftvhelp.o","ftvhelp.cpp","\$(GENERATED_SRC)/navtree.js.h","\$(GENERATED_SRC)/resize.js.h","\$(GENERATED_SRC)/navtree.css.h"); +#$ GenerateDep("ftvhelp.cpp","\$(GENERATED_SRC)/navtree.js.h","\$(GENERATED_SRC)/resize.js.h","\$(GENERATED_SRC)/navtree.css.h"); -#$ GenerateDep("\$(GENERATED_OBJ)/htmlgen.o","htmlgen.cpp","\$(GENERATED_SRC)/header.html.h","\$(GENERATED_SRC)/footer.html.h","\$(GENERATED_SRC)/doxygen.css.h","\$(GENERATED_SRC)/search_functions.php.h","\$(GENERATED_SRC)/search_opensearch.php.h","\$(GENERATED_SRC)/search.css.h","\$(GENERATED_SRC)/jquery_p1.js.h","\$(GENERATED_SRC)/jquery_p2.js.h","\$(GENERATED_SRC)/jquery_p3.js.h","\$(GENERATED_SRC)/jquery_ui.js.h","\$(GENERATED_SRC)/jquery_fx.js.h","\$(GENERATED_SRC)/jquery_pt.js.h","\$(GENERATED_SRC)/svgpan.js.h","\$(GENERATED_SRC)/dynsections.js.h","\$(GENERATED_SRC)/extsearch.js.h"); +#$ GenerateDep("htmlgen.cpp","\$(GENERATED_SRC)/header.html.h","\$(GENERATED_SRC)/footer.html.h","\$(GENERATED_SRC)/doxygen.css.h","\$(GENERATED_SRC)/search_functions.php.h","\$(GENERATED_SRC)/search_opensearch.php.h","\$(GENERATED_SRC)/search.css.h","\$(GENERATED_SRC)/jquery_p1.js.h","\$(GENERATED_SRC)/jquery_p2.js.h","\$(GENERATED_SRC)/jquery_p3.js.h","\$(GENERATED_SRC)/jquery_ui.js.h","\$(GENERATED_SRC)/jquery_fx.js.h","\$(GENERATED_SRC)/jquery_pt.js.h","\$(GENERATED_SRC)/svgpan.js.h","\$(GENERATED_SRC)/dynsections.js.h","\$(GENERATED_SRC)/extsearch.js.h"); -#$ GenerateDep("\$(GENERATED_OBJ)/xmlgen.o","xmlgen.cpp","\$(GENERATED_SRC)/index.xsd.h","\$(GENERATED_SRC)/compound.xsd.h"); +#$ GenerateDep("xmlgen.cpp","\$(GENERATED_SRC)/index.xsd.h","\$(GENERATED_SRC)/compound.xsd.h"); -#$ GenerateDep("\$(GENERATED_OBJ)/latexgen.o","latexgen.cpp","\$(GENERATED_SRC)/doxygen.sty.h"); +#$ GenerateDep("latexgen.cpp","\$(GENERATED_SRC)/doxygen.sty.h"); -#$ GenerateDep("\$(GENERATED_OBJ)/searchindex.o","searchindex.cpp","\$(GENERATED_SRC)/search.js.h"); +#$ GenerateDep("searchindex.cpp","\$(GENERATED_SRC)/search.js.h"); $(GENERATED_SRC)/index.xsd.h: index.xsd $(TO_C_CMD) -- cgit v0.12