[MERGE] (master|GPIAG/master): merge upstream master

Merge remote-tracking branch 'GPIAG/master'

.gitignore

@@ -12,6 +12,11 @@ manual_DENISE.pdf
 *.bin*
 *.su*
 LOG_FILE.*
+*.vp*
+*.vs*
+*.rho*
+*.div*
+*.rot*
 
 ### C ###
 # Object files
@@ -325,25 +330,3 @@ local.properties
 
 # TeXlipse plugin
 .texlipse
-
-
-### CMake ###
-CMakeCache.txt
-CMakeFiles
-CMakeScripts
-Makefile
-cmake_install.cmake
-install_manifest.txt
-
-
-### premake-gmake ###
-Makefile
-*.make
-obj/
-
-*.vp*
-*.vs*
-*.rho*
-*.div*
-*.rot*
-

INSTALL

@@ -2,24 +2,22 @@ INSTALL for DENISE
 ==================
 
 A detailed installation instruction is provided in the chapter 5 of the 
-documentation (manual_DENISE.pdf).
+documentation (DENISE/doc/manual_DENISE.pdf). If the manual is not compiled,
+please use the script DENISE/doc/compile_LaTeX_manual.sh
 
-Before compiling the main program DENISE you have to compile the required 
-additional libraries. In the DENISE/par directory simply use the shell script
+To compile DENISE a MAKEFILE is available in the DENISE/par directory. To
+use the MAKEFILE type
 
-./compileLIBRARIES.sh
+make
 
-which should install the following libraries:
+in the DENISE/par directory. The MAKEFILE compiles the additional libaries
 
 lib cseife
 lib stfinv
 lib aff
 lib fourier
 
-To compile the program DENISE you can use the shell script located in the
-Directory DENISE/par:
-
-./compileDENISE.sh
+before compiling the main program DENISE.
 
 -------------------------------------------