Spitting generated files better from source files

This patch is a patch for the build system so that less (no) generated files are in the source directories and also that the different build (on windows are independent of each others). Also the different sub-projects (e.g. doxygen , doxywizard) don't share any files anymore.

- ./.gitignore
  A number of files are not in the src directory anymore. generated directories are included. rtf and xml directories are there for possible future use.

- ./Doxyfile
  The generated files are not anymore in the src directory so they don't have to be excluded anymore

- ./configure
  Adjustmenst so the generated files are in the different subdirectories

- ./Makefile.in
- addon/doxmlparser/examples/metrics/metrics.pro.in
- addon/doxmlparser/src/doxmlparser.pro.in
- addon/doxmlparser/test/xmlparse.pro.in
- addon/doxyapp/doxyapp.pro.in
- addon/doxysearch/doxyindexer.pro.in
- addon/doxysearch/doxysearch.pro.in
- addon/doxywizard/Makefile.in
- addon/doxywizard/doxywizard.pro.in
- libmd5/libmd5.pro.in
- qtools/qtools.pro.in
- src/Makefile.in
- src/doxygen.pro.in
- src/libdoxycfg.pro.in
- src/libdoxycfg.t.in
- src/libdoxygen.pro.in
- src/libdoxygen.t.in
  Adjustment to the new directory structure

- addon/doxywizard/expert.cpp
  include file is generated in the generated_src/doxywizard directory, referenced through -I on compile line

- src/lang_cfg.h
  File is now automatically generated

- src/languages.py
  Correction of used path for new structure

- src/settings.py
- src/version.py
  Place for resulting file handled through an argument, so it is possible to have a separate file for each sub-project

- tmake/lib/win32-g++/generic.t
- tmake/lib/win32-mingw/generic.t
  The destination path was added twice, in case of a depth of more than 1 level (doxmlparser) this lead to problems

- winbuild/Config.rules
- winbuild/Gen_head.rules
- winbuild/Languages.rules
- winbuild/Lex.rules
- winbuild/Settings.rules
- winbuild/Version.rules
  correcting some path of generated files

- winbuild/Doxygen.sln
  Build order dependency could be dropped  as the version.cpp file is now a generated file for doxygen and doxywizard

- winbuild/Doxygen.vcproj
- winbuild/Doxywizard.vcproj
  Corrected paths to the new structure. Added unistd as an external generated file

- winbuild/unistd.h
  File is now generated

- winbuild/Unistd.rules
- winbuild/unistd.py
  Generated unistd for doxygen and doxywizard in a consistent way.

- winbuild/doxyindexer.vcproj
- winbuild/doxysearch.vcproj
- winbuild/qtools.vcproj
  Corrected paths to the new structure.

- winbuild/runbison.bat
- winbuild/version.bat
  Not used anymore everything handled through rules.

10 files changed, 135 insertions, 171 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 7d1d0d9..9d86213 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -14,6 +14,8 @@
 # input used in their production; they are not affected by this license.
 #
 
+GENERATED_SRC = ../generated_src/doxygen
+
 all: Makefile.libdoxygen Makefile.libdoxycfg Makefile.doxygen Makefile
 	$(MAKE) -f Makefile.libdoxycfg $@
 	$(MAKE) -f Makefile.libdoxygen $@
@@ -42,7 +44,7 @@ clean: Makefile.libdoxygen Makefile.libdoxycfg Makefile.doxygen
 
 # also clean flex/bison generated files
 distclean: clean
-	-$(RM) scanner.cpp code.cpp config.cpp pre.cpp constexp.cpp \
+	-cd $(GENERATED_SRC) && $(RM) scanner.cpp code.cpp config.cpp pre.cpp constexp.cpp \
 	       ce_parse.cpp ce_parse.h tag.cpp commentscan.cpp \
 	       declinfo.cpp defargs.cpp commentcnv.cpp doctokenizer.cpp \
 	       pycode.cpp pyscanner.cpp fortrancode.cpp fortranscanner.cpp \
@@ -51,11 +53,11 @@ distclean: clean
 
 # clean also the generated files which are in SVN
 realclean: distclean
-	-$(RM) index.xsd.h compound.xsd.h layout_default.xml.h \
+	-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 configoptions.cpp jquery_pt.js.h extsearch.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/doxygen.pro.in b/src/doxygen.pro.in
index d9589e7..f6b7763 100644
--- a/src/doxygen.pro.in
+++ b/src/doxygen.pro.in
@@ -35,5 +35,5 @@ unix:TARGETDEPS            =  ../lib/libdoxygen.a ../lib/libdoxycfg.a
 win32:TARGETDEPS           =  ..\lib\doxygen.lib ..\lib\doxycfg.lib
 win32-g++:TARGETDEPS       =  ../lib/libdoxygen.a ../lib/libdoxycfg.a
 win32-mingw:TARGETDEPS     =  ../lib/libdoxygen.a ../lib/libdoxycfg.a
-OBJECTS_DIR                =  ../objects
+OBJECTS_DIR                =  ../objects/doxygen
 
diff --git a/src/lang_cfg.h b/src/lang_cfg.h
deleted file mode 100644
index 769696c..0000000
--- a/src/lang_cfg.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#define LANG_AM
-#define LANG_AR
-#define LANG_BR
-#define LANG_CA
-#define LANG_CN
-#define LANG_CZ
-#define LANG_DE
-#define LANG_DK
-#define LANG_EN
-#define LANG_EO
-#define LANG_ES
-#define LANG_FA
-#define LANG_FI
-#define LANG_FR
-#define LANG_GR
-#define LANG_HR
-#define LANG_HU
-#define LANG_ID
-#define LANG_IT
-#define LANG_JE
-#define LANG_JP
-#define LANG_KE
-#define LANG_KR
-#define LANG_LT
-#define LANG_LV
-#define LANG_MK
-#define LANG_NL
-#define LANG_NO
-#define LANG_PL
-#define LANG_PT
-#define LANG_RO
-#define LANG_RU
-#define LANG_SC
-#define LANG_SI
-#define LANG_SK
-#define LANG_SR
-#define LANG_SV
-#define LANG_TR
-#define LANG_TW
-#define LANG_UA
-#define LANG_VI
-#define LANG_ZA
diff --git a/src/languages.py b/src/languages.py
index 0005e88..7ce382a 100755
--- a/src/languages.py
+++ b/src/languages.py
@@ -25,8 +25,8 @@ print """\
                 <CustomBuildRule
                         Name="Languages"
                         DisplayName="Settings"
-                        CommandLine="python $(InputPath) [AllOptions] [AdditionalOptions] &gt; $(InputDir)../src/$(InputName).h"
-                        Outputs="$(InputDir)../src/$(InputName).h"
+                        CommandLine="python $(InputPath) [AllOptions] [AdditionalOptions] &gt; $(InpDir)/$(InputName).h"
+                        Outputs="$(IntDir)/$(InputName).h"
                         FileExtensions="*.py"
                         AdditionalDependencies=""
                         ExecutionDescription="Executing languages ..."
diff --git a/src/libdoxycfg.pro.in b/src/libdoxycfg.pro.in
index 6a63828..5bd3e1e 100644
--- a/src/libdoxycfg.pro.in
+++ b/src/libdoxycfg.pro.in
@@ -17,11 +17,11 @@
 TEMPLATE     =	libdoxycfg.t
 CONFIG       =	console warn_on staticlib $extraopts
 HEADERS      =  config.h configoptions.h portable.h
-SOURCES      =	config.cpp 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-g++:TMAKE_CXXFLAGS   += -fno-exceptions -fno-rtti
-INCLUDEPATH                += ../qtools
+INCLUDEPATH                += . ../qtools
 win32:INCLUDEPATH          += .
 DESTDIR                    =  ../lib
 TARGET                     =  doxycfg
-OBJECTS_DIR                =  ../objects
+OBJECTS_DIR                =  ../objects/doxygen
diff --git a/src/libdoxycfg.t.in b/src/libdoxycfg.t.in
index 3a2ce0a..0afb9c6 100644
--- a/src/libdoxycfg.t.in
+++ b/src/libdoxycfg.t.in
@@ -45,9 +45,9 @@ sub GenerateDep {
 
 ####################
 
-#$ GenerateDep("config.cpp","config.l");
-	$(LEX) -PconfigYY -t config.l >config.cpp 
+#$ GenerateDep("../generated_src/doxygen/config.cpp","config.l");
+	$(LEX) -PconfigYY -t config.l >../generated_src/doxygen/config.cpp 
 
-configoptions.cpp: config.xml configgen.py
-	$(PYTHON) configgen.py -cpp config.xml >configoptions.cpp
+../generated_src/doxygen/configoptions.cpp: config.xml configgen.py
+	$(PYTHON) configgen.py -cpp config.xml >../generated_src/doxygen/configoptions.cpp
 
diff --git a/src/libdoxygen.pro.in b/src/libdoxygen.pro.in
index b230b2f..7a54744 100644
--- a/src/libdoxygen.pro.in
+++ b/src/libdoxygen.pro.in
@@ -17,7 +17,7 @@
 TEMPLATE     =	libdoxygen.t
 CONFIG       =	console warn_on staticlib $extraopts
 HEADERS      =	arguments.h \
-                bib2xhtml.pl.h \
+                ../generated_src/doxygen/bib2xhtml.pl.h \
                 bufstr.h \
 		cite.h \
 		clangparser.h \
@@ -27,7 +27,7 @@ HEADERS      =	arguments.h \
                 code.h \
 		commentcnv.h \
 		commentscan.h \
-                compound.xsd.h \
+                ../generated_src/doxygen/compound.xsd.h \
 		condparser.h \
                 config.h \
 		context.h \
@@ -47,20 +47,20 @@ HEADERS      =	arguments.h \
                 docvisitor.h \
 		dot.h \
 		doxygen.h \
-		doxygen.bst.h \
-		doxygen.css.h \
-		doxygen.sty.h \
+		../generated_src/doxygen/doxygen.bst.h \
+		../generated_src/doxygen/doxygen.css.h \
+		../generated_src/doxygen/doxygen.sty.h \
 		eclipsehelp.h \
 		entry.h \
 		example.h \
 		filedef.h \
 		filename.h \
-		footer.html.h \
+		../generated_src/doxygen/footer.html.h \
 		formula.h \
 		ftextstream.h \
 		ftvhelp.h \
 		groupdef.h \
-		header.html.h \
+		../generated_src/doxygen/header.html.h \
 		htags.h \
 		htmlattrib.h \
                 htmldocvisitor.h \
@@ -68,20 +68,20 @@ HEADERS      =	arguments.h \
 		htmlhelp.h \
 		image.h \
 		index.h \
-                index.xsd.h \
-		jquery_p1.js.h \
-		jquery_p2.js.h \
-		jquery_p3.js.h \
-		jquery_ui.js.h \
-		jquery_fx.js.h \
-		jquery_pt.js.h \
-		svgpan.js.h \
-		dynsections.js.h \
+                ../generated_src/doxygen/index.xsd.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 \
 		language.h \
                 latexdocvisitor.h \
 		latexgen.h \
                 layout.h \
-                layout_default.xml.h \
+                ../generated_src/doxygen/layout_default.xml.h \
 		logos.h \
 		mandocvisitor.h \
 		mangen.h \
@@ -96,8 +96,8 @@ HEADERS      =	arguments.h \
                 msc.h \
                 dia.h \
 		namespacedef.h \
-		navtree.css.h \
-		navtree.js.h \
+		../generated_src/doxygen/navtree.css.h \
+		../generated_src/doxygen/navtree.js.h \
                 objcache.h \
 		outputgen.h \
 		outputlist.h \
@@ -114,17 +114,17 @@ HEADERS      =	arguments.h \
 		qhp.h \
 		qhpxmlwriter.h \
 		reflist.h \
-		resize.js.h \
+		../generated_src/doxygen/resize.js.h \
                 rtfdocvisitor.h \
 		rtfgen.h \
 		rtfstyle.h \
 		scanner.h \
 		searchindex.h \
-		search.css.h \
-		search.js.h \
-		extsearch.js.h \
-		search_functions.php.h \
-		search_opensearch.php.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 \
 		section.h \
 		sortdict.h \
                 store.h \
@@ -146,31 +146,25 @@ HEADERS      =	arguments.h \
                 docbookgen.h
 
 SOURCES      =	arguments.cpp \
-                constexp.cpp \
-                ce_parse.cpp \
+                ../generated_src/doxygen/ce_parse.cpp \
+                ../generated_src/doxygen/constexp.cpp \
 		cite.cpp \
 		clangparser.cpp \
 		classdef.cpp \
 		classlist.cpp \
                 cmdmapper.cpp \
-		code.cpp \
-		commentcnv.cpp \
-		commentscan.cpp \
 		condparser.cpp \
 		context.cpp \
 		cppvalue.cpp \
                 dbusxmlscanner.cpp \
 		debug.cpp \
                 defgen.cpp \
-		declinfo.cpp \
-		defargs.cpp \
 		define.cpp \
 		definition.cpp \
 		diagram.cpp \
                 dirdef.cpp \
                 docparser.cpp \
 		docsets.cpp \
-                doctokenizer.cpp \
 		dot.cpp \
 		doxygen.cpp \
 		eclipsehelp.cpp \
@@ -180,8 +174,6 @@ SOURCES      =	arguments.cpp \
 		formula.cpp \
 		ftextstream.cpp \
 		ftvhelp.cpp \
-		fortrancode.cpp \
-		fortranscanner.cpp \    
 		groupdef.cpp \
 		htags.cpp \
                 htmldocvisitor.cpp \
@@ -213,46 +205,56 @@ SOURCES      =	arguments.cpp \
 		outputlist.cpp \
 		pagedef.cpp \
 		perlmodgen.cpp \
-		pre.cpp \
-		pycode.cpp \
-		pyscanner.cpp \    
 		qhp.cpp \
 		qhpxmlwriter.cpp \
 		reflist.cpp \
                 rtfdocvisitor.cpp \
 		rtfgen.cpp \
 		rtfstyle.cpp \
-		scanner.cpp \
 		searchindex.cpp \
                 store.cpp \
 		tagreader.cpp \
-                tclscanner.cpp \
 		template.cpp \
                 textdocvisitor.cpp \
                 tooltip.cpp \
 		util.cpp \
-		version.cpp \
-		vhdlcode.cpp \
+		../generated_src/doxygen/vhdlcode.cpp \
 		vhdldocgen.cpp \
-		vhdlparser.cpp \
-		vhdlscanner.cpp \
+		../generated_src/doxygen/vhdlparser.cpp \
+		../generated_src/doxygen/vhdlscanner.cpp \
 		xmldocvisitor.cpp \
                 xmlgen.cpp \
                 docbookvisitor.cpp \
-                docbookgen.cpp
+                docbookgen.cpp \
+		../generated_src/doxygen/code.cpp \
+		../generated_src/doxygen/commentcnv.cpp \
+		../generated_src/doxygen/commentscan.cpp \
+		../generated_src/doxygen/declinfo.cpp \
+		../generated_src/doxygen/defargs.cpp \
+                ../generated_src/doxygen/doctokenizer.cpp \
+		../generated_src/doxygen/pre.cpp \
+		../generated_src/doxygen/pycode.cpp \
+		../generated_src/doxygen/pyscanner.cpp \    
+		../generated_src/doxygen/scanner.cpp \
+                ../generated_src/doxygen/tclscanner.cpp \
+		../generated_src/doxygen/fortrancode.cpp \
+		../generated_src/doxygen/fortranscanner.cpp \    
+		../generated_src/doxygen/version.cpp
 
 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
 INCLUDEPATH                += %%SQLITE3_INC%%
 win32:INCLUDEPATH          += .
 #win32-g++:INCLUDEPATH      = ../qtools /usr/include/libpng12 ../libmd5
-win32-g++:INCLUDEPATH      = ../qtools ../libmd5
+win32-g++:INCLUDEPATH      = ../generated_src/doxygen ../src ../qtools ../libmd5
 DESTDIR                    =  ../lib
 TARGET                     =  doxygen
-OBJECTS_DIR                =  ../objects
+OBJECTS_DIR                =  ../objects/doxygen
 
diff --git a/src/libdoxygen.t.in b/src/libdoxygen.t.in
index f131f70..2e03224 100644
--- a/src/libdoxygen.t.in
+++ b/src/libdoxygen.t.in
@@ -21,6 +21,7 @@ YACC       = %%BISON%%
 PYTHON     = %%PYTHON%%
 PERL       = %%PERL%%
 INCBUFSIZE = $(PYTHON) increasebuffer.py
+GENERATED_SRC = ../generated_src/doxygen
 
 #${
 sub GenerateDep {
@@ -49,170 +50,169 @@ sub GenerateLex {
     if ($caseOpt) {
         $text .= "-i ";
     }
-    $text .= "-P".$name."YY -t ".$name.".l | \$(INCBUFSIZE) >".$name.".cpp";
+    $text .= "-P".$name."YY -t ".$name.".l | \$(INCBUFSIZE) > \$(GENERATED_SRC)/".$name.".cpp";
 }
 #$} 
 
 ####################
 
-#$ GenerateDep("scanner.cpp","scanner.l");
+#$ GenerateDep("\$(GENERATED_SRC)/scanner.cpp","scanner.l");
 #$ GenerateLex("scanner",0);
 
-#$ GenerateDep("code.cpp","code.l");
+#$ GenerateDep("\$(GENERATED_SRC)/code.cpp","code.l");
 #$ GenerateLex("code",0);
 
-#$ GenerateDep("pyscanner.cpp","pyscanner.l");
+#$ GenerateDep("\$(GENERATED_SRC)/pyscanner.cpp","pyscanner.l");
 #$ GenerateLex("pyscanner",0);
 
-#$ GenerateDep("pycode.cpp","pycode.l");
+#$ GenerateDep("\$(GENERATED_SRC)/pycode.cpp","pycode.l");
 #$ GenerateLex("pycode",0);
 
-#$ GenerateDep("fortranscanner.cpp","fortranscanner.l");
+#$ GenerateDep("\$(GENERATED_SRC)/fortranscanner.cpp","fortranscanner.l");
 #$ GenerateLex("fortranscanner",1);
 
-#$ GenerateDep("fortrancode.cpp","fortrancode.l");
+#$ GenerateDep("\$(GENERATED_SRC)/fortrancode.cpp","fortrancode.l");
 #$ GenerateLex("fortrancode",1);
 
-#$ GenerateDep("vhdlcode.cpp","vhdlcode.l");
+#$ GenerateDep("\$(GENERATED_SRC)/vhdlcode.cpp","vhdlcode.l");
 #$ GenerateLex("vhdlcode",1);
 
-#$ GenerateDep("tclscanner.cpp","tclscanner.l");
+#$ GenerateDep("\$(GENERATED_SRC)/tclscanner.cpp","tclscanner.l");
 #$ GenerateLex("tclscanner",1);
 
-#$ GenerateDep("pre.cpp","pre.l");
+#$ GenerateDep("\$(GENERATED_SRC)/pre.cpp","pre.l");
 #$ GenerateLex("pre",0);
 
-#$ GenerateDep("declinfo.cpp","declinfo.l");
+#$ GenerateDep("\$(GENERATED_SRC)/declinfo.cpp","declinfo.l");
 #$ GenerateLex("declinfo",0);
 
-#$ GenerateDep("defargs.cpp","defargs.l");
+#$ GenerateDep("\$(GENERATED_SRC)/defargs.cpp","defargs.l");
 #$ GenerateLex("defargs",0);
 
-#$ GenerateDep("doctokenizer.cpp","doctokenizer.l");
+#$ GenerateDep("\$(GENERATED_SRC)/doctokenizer.cpp","doctokenizer.l");
 #$ GenerateLex("doctokenizer",0);
 
-#$ GenerateDep("commentcnv.cpp","commentcnv.l");
+#$ GenerateDep("\$(GENERATED_SRC)/commentcnv.cpp","commentcnv.l");
 #$ GenerateLex("commentcnv",0);
 
-#$ GenerateDep("commentscan.cpp","commentscan.l");
+#$ GenerateDep("\$(GENERATED_SRC)/commentscan.cpp","commentscan.l");
 #$ GenerateLex("commentscan",0);
 
-#$ GenerateDep("constexp.cpp","constexp.l","ce_parse.h");
+#$ GenerateDep("../generated_src/doxygen/constexp.cpp","constexp.l","../generated_src/doxygen/ce_parse.h");
 #$ GenerateLex("constexp",0);
 
-#$ GenerateDep("ce_parse.cpp","constexp.y");
-	$(YACC) -l -p constexpYY constexp.y -o ce_parse.cpp 
+#$ GenerateDep("../generated_src/doxygen/ce_parse.cpp","constexp.y");
+	$(YACC) -l -p constexpYY constexp.y -o ../generated_src/doxygen/ce_parse.cpp 
 
-#$ GenerateDep("ce_parse.h","constexp.y");
-	$(YACC) -l -d -p ce_parsexpYY constexp.y -o ce_parse.c 
-	-rm ce_parse.c
+#$ GenerateDep("../generated_src/doxygen/ce_parse.h","constexp.y");
+	$(YACC) -l -d -p ce_parsexpYY constexp.y -o ../generated_src/doxygen/ce_parse.c 
+	-rm ../generated_src/doxygen/ce_parse.c
 
-#$ GenerateDep("vhdlscanner.cpp","vhdlscanner.l","vhdlparser.h");
+#$ GenerateDep("\$(GENERATED_SRC)/vhdlscanner.cpp","vhdlscanner.l","../generated_src/doxygen/vhdlparser.h");
 #$ GenerateLex("vhdlscanner",1);
 
-#$ GenerateDep("vhdlparser.cpp","vhdlparser.y");
-	$(YACC) -l -p vhdlscannerYY vhdlparser.y -o vhdlparser.cpp 	
+#$ GenerateDep("../generated_src/doxygen/vhdlparser.cpp","vhdlparser.y");
+	$(YACC) -l -p vhdlscannerYY vhdlparser.y -o ../generated_src/doxygen/vhdlparser.cpp 	
 
-#$ GenerateDep("vhdlparser.h","vhdlparser.y");
-	$(YACC) -l -d -p vhdlscannerYY vhdlparser.y -o vhdlparser.c 
-	-rm vhdlparser.c	
+#$ GenerateDep("../generated_src/doxygen/vhdlparser.h","vhdlparser.y");
+	$(YACC) -l -d -p vhdlscannerYY vhdlparser.y -o ../generated_src/doxygen/vhdlparser.c 
+	-rm ../generated_src/doxygen/vhdlparser.c	
 	
-#$ GenerateDep("layout.cpp","layout_default.xml.h");
-
 TO_C_CMD=$(PYTHON) to_c_cmd.py < $< > $@
 
-cite.cpp: doxygen.bst.h bib2xhtml.pl.h
+layout.cpp: $(GENERATED_SRC)/layout_default.xml.h
 
-ftvhelp.cpp: navtree.js.h resize.js.h navtree.css.h
+cite.cpp: $(GENERATED_SRC)/doxygen.bst.h $(GENERATED_SRC)/bib2xhtml.pl.h
 
-htmlgen.cpp: header.html.h footer.html.h doxygen.css.h search_functions.php.h \
-             search_opensearch.php.h search.css.h jquery_p1.js.h jquery_p2.js.h \
-	     jquery_p3.js.h jquery_ui.js.h jquery_fx.js.h jquery_pt.js.h \
-	     svgpan.js.h dynsections.js.h extsearch.js.h
+ftvhelp.cpp: $(GENERATED_SRC)/navtree.js.h $(GENERATED_SRC)/resize.js.h $(GENERATED_SRC)/navtree.css.h
 
-layout.cpp: layout_default.xml.h
+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
 
-xmlgen.cpp: index.xsd.h compound.xsd.h
+layout.cpp: $(GENERATED_SRC)/layout_default.xml.h
 
-latexgen.cpp: doxygen.sty.h
+xmlgen.cpp: $(GENERATED_SRC)/index.xsd.h $(GENERATED_SRC)/compound.xsd.h
 
-searchindex.cpp: search.js.h
+latexgen.cpp: $(GENERATED_SRC)/doxygen.sty.h
 
-index.xsd.h: index.xsd
-	$(TO_C_CMD)
+searchindex.cpp: $(GENERATED_SRC)/search.js.h
 
-compound.xsd.h: compound.xsd
+$(GENERATED_SRC)/index.xsd.h: index.xsd
 	$(TO_C_CMD)
 
-layout_default.xml.h: layout_default.xml
+$(GENERATED_SRC)/compound.xsd.h: compound.xsd
 	$(TO_C_CMD)
 
-header.html.h: header.html
+$(GENERATED_SRC)/layout_default.xml.h: layout_default.xml
 	$(TO_C_CMD)
 
-footer.html.h: footer.html
+$(GENERATED_SRC)/header.html.h: header.html
 	$(TO_C_CMD)
 
-search_functions.php.h: search_functions.php
+$(GENERATED_SRC)/footer.html.h: footer.html
 	$(TO_C_CMD)
 
-search_opensearch.php.h: search_opensearch.php
+$(GENERATED_SRC)/search_functions.php.h: search_functions.php
 	$(TO_C_CMD)
 
-search.js.h: search.js
+$(GENERATED_SRC)/search_opensearch.php.h: search_opensearch.php
 	$(TO_C_CMD)
 
-search.css.h: search.css
+$(GENERATED_SRC)/search.js.h: search.js
 	$(TO_C_CMD)
 
-extsearch.js.h: extsearch.js
+$(GENERATED_SRC)/search.css.h: search.css
 	$(TO_C_CMD)
 
-doxygen.css.h: doxygen.css
+$(GENERATED_SRC)/extsearch.js.h: extsearch.js
 	$(TO_C_CMD)
 
-doxygen.sty.h: doxygen.sty
+$(GENERATED_SRC)/doxygen.css.h: doxygen.css
 	$(TO_C_CMD)
 
+$(GENERATED_SRC)/doxygen.sty.h: doxygen.sty
+	$(TO_C_CMD)
 
-navtree.js.h: navtree.js
+$(GENERATED_SRC)/navtree.js.h: navtree.js
 	$(TO_C_CMD)
 
-resize.js.h: resize.js
+$(GENERATED_SRC)/resize.js.h: resize.js
 	$(TO_C_CMD)
 
-jquery_p1.js.h: jquery_p1.js
+$(GENERATED_SRC)/jquery_p1.js.h: jquery_p1.js
 	$(TO_C_CMD)
 
-jquery_p2.js.h: jquery_p2.js
+$(GENERATED_SRC)/jquery_p2.js.h: jquery_p2.js
 	$(TO_C_CMD)
 
-jquery_p3.js.h: jquery_p3.js
+$(GENERATED_SRC)/jquery_p3.js.h: jquery_p3.js
 	$(TO_C_CMD)
 
-jquery_ui.js.h: jquery_ui.js
+$(GENERATED_SRC)/jquery_ui.js.h: jquery_ui.js
 	$(TO_C_CMD)
 
-jquery_fx.js.h: jquery_fx.js
+$(GENERATED_SRC)/jquery_fx.js.h: jquery_fx.js
 	$(TO_C_CMD)
 
-jquery_pt.js.h: jquery_pt.js
+$(GENERATED_SRC)/jquery_pt.js.h: jquery_pt.js
 	$(TO_C_CMD)
 
-navtree.css.h: navtree.css
+$(GENERATED_SRC)/navtree.css.h: navtree.css
 	$(TO_C_CMD)
 
-svgpan.js.h: svgpan.js
+$(GENERATED_SRC)/svgpan.js.h: svgpan.js
 	$(TO_C_CMD)
 
-dynsections.js.h: dynsections.js
+$(GENERATED_SRC)/dynsections.js.h: dynsections.js
 	$(TO_C_CMD)
 
-doxygen.bst.h: doxygen.bst
+$(GENERATED_SRC)/doxygen.bst.h: doxygen.bst
 	$(TO_C_CMD)
 
-bib2xhtml.pl.h: bib2xhtml.pl
+$(GENERATED_SRC)/bib2xhtml.pl.h: bib2xhtml.pl
 	$(TO_C_CMD)
 
-version.cpp: ../configure
-	$(PYTHON) version.py
+$(GENERATED_SRC)/version.cpp: ../configure
+	$(PYTHON) version.py $(GENERATED_SRC)
diff --git a/src/settings.py b/src/settings.py
index af24e7b..a9dfa13 100755
--- a/src/settings.py
+++ b/src/settings.py
@@ -1,11 +1,12 @@
 # 
 
 import sys
+import os
 
 f_sqlite3 = sys.argv[1]
 f_libclang = sys.argv[2]
 
-f1 = open('../src/settings.h','w')
+f1 = open(os.path.join(sys.argv[3],'settings.h'),'w')
 f1.write("#ifndef SETTINGS_H\n")
 f1.write("#define SETTINGS_H\n")
 f1.write("\n")
diff --git a/src/version.py b/src/version.py
index c53303d..003cf95 100755
--- a/src/version.py
+++ b/src/version.py
@@ -9,6 +9,7 @@
 # the collected information is written to: `../VERSION` and `../src/version.cpp`
 #
 import sys
+import os
 #
 # set 'default' values
 #
@@ -46,7 +47,7 @@ mnt = mnt.replace('\n','')
 # close files
 #
 f1 = open('../VERSION','w')
-f2 = open('../src/version.cpp','w')
+f2 = open(os.path.join(sys.argv[1],'version.cpp'),'w')
 if (mnt == 'NO'):
     f1.write(major + '.' + minor + '.' + revision)
     f2.write('char versionString[]="' + major + '.' + minor + '.' + revision + '";')