SF.net SVN: geany: [2280] trunk

[eht16 at users.sourceforge.net]

Revision: 2280
          http://geany.svn.sourceforge.net/geany/?rev=2280&view=rev
Author:   eht16
Date:     2008-02-24 02:30:57 -0800 (Sun, 24 Feb 2008)

Log Message:
-----------
Make the make command overwritable, patch by Pierre Joye. Thanks.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/makefile.win32

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-02-24 10:27:32 UTC (rev 2279)
+++ trunk/ChangeLog	2008-02-24 10:30:57 UTC (rev 2280)
@@ -10,6 +10,8 @@
    Apply patch by Pierre Joye to add new process spawning implementation
    for Windows. Make utils_spawn_* available to plugin API.
    This makes the VCdiff plugin to work on Windows (thanks).
+ * makefile.win32:
+   Make the make command overwritable, patch by Pierre Joye. Thanks.
 
 
 2008-02-22  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/makefile.win32
===================================================================
--- trunk/makefile.win32	2008-02-24 10:27:32 UTC (rev 2279)
+++ trunk/makefile.win32	2008-02-24 10:30:57 UTC (rev 2280)
@@ -16,15 +16,16 @@
 CXX = g++
 CP = copy
 RM = del
+MAKE = make
 -include localwin32.mk
 
 # Note: && is needed after cd because each line is executed in a different
 # shell. (cd .. is just for clarity).
 all: check-tools config.h
-	cd tagmanager && make -f makefile.win32 && cd ..
-	cd scintilla && make -f makefile.win32 && cd ..
-	cd plugins && make -f makefile.win32 && cd ..
-	cd src && make -f makefile.win32 && cd ..
+	cd tagmanager && $(MAKE) -f makefile.win32 && cd ..
+	cd scintilla && $(MAKE) -f makefile.win32 && cd ..
+	cd plugins && $(MAKE) -f makefile.win32 && cd ..
+	cd src && $(MAKE) -f makefile.win32 && cd ..
 
 # first check the required tools are installed
 check-tools:
@@ -43,7 +44,7 @@
 	-$(RM) geany_private.res geany.exe
 
 clean: deps
-	cd tagmanager && make -f makefile.win32 clean && cd ..
-	cd scintilla && make -f makefile.win32 clean && cd ..
-	cd plugins && make -f makefile.win32 clean && cd ..
-	cd src && make -f makefile.win32 clean && cd ..
+	cd tagmanager && $(MAKE) -f makefile.win32 clean && cd ..
+	cd scintilla && $(MAKE) -f makefile.win32 clean && cd ..
+	cd plugins && $(MAKE) -f makefile.win32 clean && cd ..
+	cd src && $(MAKE) -f makefile.win32 clean && cd ..


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.