Skip to content

Commit

Permalink
Fixes for missing build dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Dimitri van Heesch committed Jan 22, 2014
1 parent bd23ac5 commit 62379ff
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 88 deletions.
13 changes: 1 addition & 12 deletions Makefile.in
View file
Expand Up @@ -49,7 +49,7 @@ distclean: clean
-rm -f libmd5/Makefile.libmd5 -rm -f libmd5/Makefile.libmd5
-rm -f .makeconfig .tmakeconfig -rm -f .makeconfig .tmakeconfig
-rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro -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 addon/doxywizard/doxywizard.pro
-rm -f VERSION -rm -f VERSION
-rm -f packages/rpm/doxygen.spec -rm -f packages/rpm/doxygen.spec
Expand All @@ -62,17 +62,6 @@ distclean: clean
-rm -f qtools/Makefile src/Makefile examples/Makefile doc/Makefile -rm -f qtools/Makefile src/Makefile examples/Makefile doc/Makefile
-rm -f 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") DATE=$(shell date "+%B %Y")


MAN1DIR = man/man1 MAN1DIR = man/man1
Expand Down
2 changes: 0 additions & 2 deletions addon/doxysearch/Makefile.in
View file
Expand Up @@ -7,8 +7,6 @@ distclean: clean
$(RM) -rf Makefile doxysearch.pro Makefile.doxysearch $(RM) -rf Makefile doxysearch.pro Makefile.doxysearch
$(RM) -rf Makefile doxyindexer.pro Makefile.doxyindexer $(RM) -rf Makefile doxyindexer.pro Makefile.doxyindexer


realclean: distclean

tmake: tmake:
$(ENV) $(PERL) "$(TMAKE)" doxysearch.pro >Makefile.doxysearch $(ENV) $(PERL) "$(TMAKE)" doxysearch.pro >Makefile.doxysearch
$(ENV) $(PERL) "$(TMAKE)" doxyindexer.pro >Makefile.doxyindexer $(ENV) $(PERL) "$(TMAKE)" doxyindexer.pro >Makefile.doxyindexer
Expand Down
5 changes: 0 additions & 5 deletions addon/doxywizard/Makefile.in
View file
Expand Up @@ -29,11 +29,6 @@ distclean: Makefile.doxywizard
$(MAKE) -f Makefile.doxywizard distclean $(MAKE) -f Makefile.doxywizard distclean
$(RM) Makefile.doxywizard $(RM) Makefile.doxywizard


realclean: Makefile.doxywizard
$(RM) ../../generated_src/doxywizard/configdoc.cpp
$(RM) ../../generated_src/doxywizard/config_doxyw.cpp
$(MAKE) distclean

install: install:
$(INSTTOOL) -d $(INSTALL)/bin $(INSTTOOL) -d $(INSTALL)/bin
$(INSTTOOL) -m 755 ../../bin/doxywizard $(INSTALL)/bin $(INSTTOOL) -m 755 ../../bin/doxywizard $(INSTALL)/bin
Expand Down
2 changes: 0 additions & 2 deletions qtools/Makefile.in
View file
Expand Up @@ -27,6 +27,4 @@ clean: Makefile.qtools


distclean: clean distclean: clean


realclean: distclean

FORCE: FORCE:
9 changes: 0 additions & 9 deletions src/Makefile.in
View file
Expand Up @@ -51,13 +51,4 @@ distclean: clean
vhdlscanner.cpp vhdlcode.cpp tclscanner.cpp vhdlparser.h \ vhdlscanner.cpp vhdlcode.cpp tclscanner.cpp vhdlparser.h \
vhdlparser.cpp 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: FORCE:
12 changes: 0 additions & 12 deletions src/docbookgen.cpp
View file
Expand Up @@ -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<char> class DocbookSectionMapper : public QIntDict<char>
{ {
public: public:
Expand Down
1 change: 1 addition & 0 deletions src/doxygen.pro.in
View file
Expand Up @@ -28,6 +28,7 @@ win32-borland:TMAKE_LFLAGS += -L..\lib -L$(BCB)\lib\psdk
win32:TMAKE_CXXFLAGS += -DQT_NODLL 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++: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 win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
DEPENDPATH += ../generated_src/doxygen
INCLUDEPATH += ../qtools ../libmd5 . INCLUDEPATH += ../qtools ../libmd5 .
DESTDIR = ../bin DESTDIR = ../bin
TARGET = doxygen TARGET = doxygen
Expand Down
4 changes: 2 additions & 2 deletions src/libdoxycfg.pro.in
View file
Expand Up @@ -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 SOURCES = ../generated_src/doxygen/config.cpp ../generated_src/doxygen/configoptions.cpp portable.cpp portable_c.c
win32:TMAKE_CXXFLAGS += -DQT_NODLL win32:TMAKE_CXXFLAGS += -DQT_NODLL
win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
INCLUDEPATH += . ../qtools DEPENDPATH += ../generated_src/doxygen
win32:INCLUDEPATH += . INCLUDEPATH += ../generated_src/doxygen . ../qtools
DESTDIR = ../lib DESTDIR = ../lib
TARGET = doxycfg TARGET = doxycfg
OBJECTS_DIR = ../objects/doxygen OBJECTS_DIR = ../objects/doxygen
39 changes: 4 additions & 35 deletions src/libdoxygen.pro.in
View file
Expand Up @@ -119,32 +119,6 @@ HEADERS = arguments.h \
xmlgen.h \ xmlgen.h \
docbookvisitor.h \ docbookvisitor.h \
docbookgen.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 \ SOURCES = arguments.cpp \
cite.cpp \ cite.cpp \
Expand Down Expand Up @@ -242,19 +216,14 @@ SOURCES = arguments.cpp \
../generated_src/doxygen/fortranscanner.cpp \ ../generated_src/doxygen/fortranscanner.cpp \
../generated_src/doxygen/version.cpp ../generated_src/doxygen/version.cpp


win32:TMAKE_CXXFLAGS += -DQT_NODLL win32:TMAKE_CXXFLAGS += -DQT_NODLL
win32-msvc:TMAKE_CXXFLAGS += -Zm200 win32-msvc:TMAKE_CXXFLAGS += -Zm200
win32-g++:TMAKE_CXXFLAGS += -fno-exceptions win32-g++:TMAKE_CXXFLAGS += -fno-exceptions
linux-g++:TMAKE_CXXFLAGS += -fno-exceptions linux-g++:TMAKE_CXXFLAGS += -fno-exceptions
INCLUDEPATH += ../generated_src/doxygen INCLUDEPATH += ../generated_src/doxygen ../src ../qtools ../libmd5
INCLUDEPATH += ../src
INCLUDEPATH += ../qtools
#INCLUDEPATH += ../libpng
INCLUDEPATH += ../libmd5
INCLUDEPATH += %%SQLITE3_INC%% INCLUDEPATH += %%SQLITE3_INC%%
DEPENDPATH += ../generated_src/doxygen
win32:INCLUDEPATH += . win32:INCLUDEPATH += .
#win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5
win32-g++:INCLUDEPATH = ../generated_src/doxygen ../src ../qtools ../libmd5
DESTDIR = ../lib DESTDIR = ../lib
TARGET = doxygen TARGET = doxygen
OBJECTS_DIR = ../objects/doxygen OBJECTS_DIR = ../objects/doxygen
Expand Down
20 changes: 11 additions & 9 deletions src/libdoxygen.t.in
View file
Expand Up @@ -26,7 +26,7 @@ GENERATED_OBJ = ../objects/doxygen


#${ #${
sub GenerateDep { sub GenerateDep {
my($obj,$src,$dep) = @_; my($obj,$src,@deps) = @_;
my(@objv,$srcv,$i,$s,$o,$d,$c); my(@objv,$srcv,$i,$s,$o,$d,$c);
@objv = split(/\s+/,$obj); @objv = split(/\s+/,$obj);
@srcv = split(/\s+/,$src); @srcv = split(/\s+/,$src);
Expand All @@ -35,7 +35,9 @@ sub GenerateDep {
$o = $objv[$i]; $o = $objv[$i];
next if $s eq ""; next if $s eq "";
$text .= $o . ": " . $s; $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 "" ) { if ( $moc_output{$s} ne "" ) {
$text .= " ${linebreak}\n\t\t" . $moc_output{$s}; $text .= " ${linebreak}\n\t\t" . $moc_output{$s};
} }
Expand Down Expand Up @@ -121,19 +123,19 @@ sub GenerateLex {


TO_C_CMD=$(PYTHON) to_c_cmd.py < $< > $@ 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 $(GENERATED_SRC)/index.xsd.h: index.xsd
$(TO_C_CMD) $(TO_C_CMD)
Expand Down

0 comments on commit 62379ff

Please sign in to comment.