[Openvas-commits] r3265 - trunk/winslad

[scm-commit@wald.intevation.org]

Author: doj
Date: 2009-05-06 23:57:35 +0200 (Wed, 06 May 2009)
New Revision: 3265

Modified:
   trunk/winslad/Makefile
   trunk/winslad/config.mk
Log:
moved variable definitions

Modified: trunk/winslad/Makefile
===================================================================
--- trunk/winslad/Makefile	2009-05-06 20:55:24 UTC (rev 3264)
+++ trunk/winslad/Makefile	2009-05-06 21:57:35 UTC (rev 3265)
@@ -4,9 +4,7 @@
 EXE=sladd.exe
 INSTALLER=winslad-installer.exe
 OBJ=main.o xml.o client.o path.o readn.o writen.o
-CXX=mingw32-g++
 CC=$(CXX)
-MAKENSIS=C:\Program Files\NSIS\makensis.exe
 
 CFLAGS+=-Wall -DDOJDEBUG=1 -DSLADD_VERSION=\"$(VERSION)\"
 CXXFLAGS=$(CFLAGS)
@@ -39,13 +37,13 @@
 
 # Generates basic code documentation (placed in doc/generated)
 doc :
-	doxygen doc/Doxyfile
+	$(DOXYGEN) doc/Doxyfile
 
 # Generates more extensive code documentation with graphs
 # (placed in doc/generated) and builts doc/generated/latex/refman.pdf
 doc-full:
-	doxygen doc/Doxyfile_full
-	if [ -d doc/generated/latex ]; then make -C doc/generated/latex; fi
+	$(DOXYGEN) doc/Doxyfile_full
+	if [ -d doc/generated/latex ]; then $(MAKE) -C doc/generated/latex; fi
 
 # Build these targets even if they seem to need no update.
 .PHONY: doc

Modified: trunk/winslad/config.mk
===================================================================
--- trunk/winslad/config.mk	2009-05-06 20:55:24 UTC (rev 3264)
+++ trunk/winslad/config.mk	2009-05-06 21:57:35 UTC (rev 3265)
@@ -4,3 +4,6 @@
 CP=copy /y /v
 XCOPY=xcopy /s /v /q /y
 RM=del /s /q
+MAKENSIS=C:\Program Files\NSIS\makensis.exe
+CXX=mingw32-g++
+DOXYGEN=doxygen