[geany/geany] 65fe86: Use PREFIX=C:/libs and minor cleanup (Windows makefiles)

[Nick Treleaven]

Branch:      refs/heads/master
Author:      Nick Treleaven <nick.treleaven at btinternet.com>
Committer:   Nick Treleaven <nick.treleaven at btinternet.com>
Date:        Wed, 04 Jul 2012 15:47:38
Commit:      65fe86369152420c4e7df32645975644dfe7b258
             https://github.com/geany/geany/commit/65fe86369152420c4e7df32645975644dfe7b258

Log Message:
-----------
Use PREFIX=C:/libs and minor cleanup (Windows makefiles)

This PREFIX works on both cmd.exe and MSYS, whereas backslash confuses
MSYS.
Use copy /y in doc/makefile.win32.
Remove unused targets binclean, exec.


Modified Paths:
--------------
    doc/makefile.win32
    makefile.win32
    plugins/makefile.win32
    scintilla/makefile.win32
    src/makefile.win32

Modified: doc/makefile.win32
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -7,7 +7,7 @@
 
 RST2HTML=python rst2html.py
 DOXYGEN=doxygen
-CP = copy
+CP = copy /y
 RM = del
 -include ../localwin32.mk
 


Modified: makefile.win32
3 files changed, 1 insertions(+), 2 deletions(-)
===================================================================
@@ -9,7 +9,6 @@
 # localwin32.mk is an optional file to override make variables.
 # Use localwin32.mk instead of editing variables as it is included in sub
 # makefiles.
-# E.g. use localwin32.mk to set PREFIX=C:/libs instead of the default C:\libs
 # For MSYS use localwin32.mk to set CP, CP_R, RM, DIRSEP.
 # By default this should work in a Windows command prompt (cmd.exe).
 
@@ -51,7 +50,7 @@ clean: deps
 	$(MAKE) -C plugins -f makefile.win32 clean
 	$(MAKE) -C src -f makefile.win32 clean
 
-.PHONY: install
+.PHONY: all clean clean-local deps install
 
 # likely requires admin privileges
 # mkdir output is ignored in case dir exists


Modified: plugins/makefile.win32
4 files changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -2,10 +2,10 @@
 
 CC = gcc
 CXX = g++
-PREFIX = C:\libs
+PREFIX = C:/libs
 RM = del
 -include ../localwin32.mk
-.SUFFIXES:
+
 .SUFFIXES: .c .o .dll
 
 GTK_INCLUDES= \


Modified: scintilla/makefile.win32
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -12,7 +12,7 @@ CXX = g++
 CC = gcc
 AR = ar
 RANLIB = ranlib
-PREFIX = C:\libs
+PREFIX = C:/libs
 RM = del
 -include ../localwin32.mk
 


Modified: src/makefile.win32
12 files changed, 2 insertions(+), 10 deletions(-)
===================================================================
@@ -12,10 +12,9 @@ DEFINES = -DHAVE_CONFIG_H \
 WINDRES = windres.exe
 CC = gcc
 CXX = g++
-RES  = ../geany_private.res
+RES = ../geany_private.res
 TARGET = ../geany.exe
-EXECDIR = c:\distrib
-PREFIX = C:\libs
+PREFIX = C:/libs
 RM = del
 -include ../localwin32.mk
 
@@ -68,7 +67,6 @@ OBJS =	about.o build.o callbacks.o dialogs.o document.o editor.o encodings.o fil
 .c.o:
 	$(CC) $(CFLAGS) -c $<
 
-# all: binclean $(TARGET) #exec
 all: $(TARGET)
 
 $(RES): ../geany_private.rc ../icons/geany.ico
@@ -79,12 +77,6 @@ clean:
 	-$(RM) deps.mak *.o
 	$(MAKE) -C .. -f makefile.win32 clean-local
 
-exec:
-	$(EXECDIR)\geany.exe
-
-binclean:
-	$(RM) $(TARGET)
-
 STLIBS = ../scintilla/scintilla.a ../tagmanager/ctags/ctags.a \
 	../tagmanager/mio/mio.a ../tagmanager/src/tagmanager.a
 


@@ Diff output truncated at 100000 characters. @@


--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).