[geany/geany] 74959b: Support MSYS=1 to enable building with MSYS; use $/ instead of DIRSEP
Nick Treleaven
git-noreply at xxxxx
Thu Jul 26 00:05:47 UTC 2012
Branch: refs/heads/document-messages
Author: Nick Treleaven <nick.treleaven at btinternet.com>
Committer: Nick Treleaven <nick.treleaven at btinternet.com>
Date: Wed, 04 Jul 2012 16:13:14
Commit: 74959b9cb91dcc4436c457f04a40df23a01de381
https://github.com/geany/geany/commit/74959b9cb91dcc4436c457f04a40df23a01de381
Log Message:
-----------
Support MSYS=1 to enable building with MSYS; use $/ instead of DIRSEP
Defining MSYS=1 is cleaner than requiring users to define CP, RM, etc.
Modified Paths:
--------------
doc/makefile.win32
makefile.win32
plugins/makefile.win32
scintilla/makefile.win32
src/makefile.win32
tagmanager/ctags/makefile.win32
tagmanager/mio/makefile.win32
tagmanager/src/makefile.win32
Modified: doc/makefile.win32
6 files changed, 4 insertions(+), 2 deletions(-)
===================================================================
@@ -3,14 +3,16 @@
# Use localwin32.mk instead of editing variables as it is included in sub
# makefiles.
# Use localwin32.mk to override RST2HTML, DOXYGEN
-# For MSYS use localwin32.mk to set CP and RM.
RST2HTML=python rst2html.py
DOXYGEN=doxygen
CP = copy /y
-RM = del
-include ../localwin32.mk
+ifdef MSYS
+CP = cp
+endif
+
doc: geany.txt
$(RST2HTML) -stg --stylesheet=geany.css $^ geany.html
Modified: makefile.win32
14 files changed, 11 insertions(+), 3 deletions(-)
===================================================================
@@ -9,7 +9,7 @@
# localwin32.mk is an optional file to override make variables.
# Use localwin32.mk instead of editing variables as it is included in sub
# makefiles.
-# For MSYS use localwin32.mk to set CP, CP_R, RM, DIRSEP.
+# For MSYS set MSYS=1.
# By default this should work in a Windows command prompt (cmd.exe).
WINDRES = windres.exe
@@ -19,11 +19,19 @@ CP = copy /Y
CP_R = xcopy /S /Y
RM = del
MKDIR = mkdir
+# $/ is used as a portable directory separator
# strip is used to prevent line wrap
-DIRSEP := $(strip \)
+/ := $(strip \)
DESTDIR = C:/Program Files/Geany
-include localwin32.mk
+ifdef MSYS
+CP = cp
+CP_R = cp -r
+RM = rm -f
+/ = /
+endif
+
all: config.h
$(MAKE) -C tagmanager/ctags -f makefile.win32
$(MAKE) -C tagmanager/mio -f makefile.win32
@@ -60,6 +68,6 @@ install:
-$(MKDIR) "$(DESTDIR)/bin"
$(CP) geany.exe "$(DESTDIR)/bin"
-$(MKDIR) "$(DESTDIR)/lib"
- $(CP) plugins$(DIRSEP)*.dll "$(DESTDIR)/lib"
+ $(CP) plugins$/*.dll "$(DESTDIR)/lib"
-$(MKDIR) "$(DESTDIR)/data"
$(CP_R) data "$(DESTDIR)/data"
Modified: plugins/makefile.win32
4 files changed, 4 insertions(+), 0 deletions(-)
===================================================================
@@ -6,6 +6,10 @@ PREFIX = C:/libs
RM = del
-include ../localwin32.mk
+ifdef MSYS
+RM = rm -f
+endif
+
.SUFFIXES: .c .o .dll
GTK_INCLUDES= \
Modified: scintilla/makefile.win32
3 files changed, 3 insertions(+), 0 deletions(-)
===================================================================
@@ -16,6 +16,9 @@ PREFIX = C:/libs
RM = del
-include ../localwin32.mk
+ifdef MSYS
+RM = rm -f
+endif
COMPLIB=scintilla.a
Modified: src/makefile.win32
4 files changed, 4 insertions(+), 0 deletions(-)
===================================================================
@@ -18,6 +18,10 @@ PREFIX = C:/libs
RM = del
-include ../localwin32.mk
+ifdef MSYS
+RM = rm -f
+endif
+
GTK_INCLUDES= \
-I$(PREFIX)/include/gtk-2.0 \
-I$(PREFIX)/lib/gtk-2.0/include \
Modified: tagmanager/ctags/makefile.win32
4 files changed, 4 insertions(+), 0 deletions(-)
===================================================================
@@ -7,6 +7,10 @@ PREFIX = C:/libs
RM = del
-include ../../localwin32.mk
+ifdef MSYS
+RM = rm -f
+endif
+
COMPLIB=ctags.a
REGEX_DEFINES = -DHAVE_REGCOMP -DSTDC_HEADERS=1
Modified: tagmanager/mio/makefile.win32
4 files changed, 4 insertions(+), 0 deletions(-)
===================================================================
@@ -7,6 +7,10 @@ PREFIX = C:/libs
RM = del
-include ../../localwin32.mk
+ifdef MSYS
+RM = rm -f
+endif
+
COMPLIB=mio.a
GTK_INCLUDES= \
Modified: tagmanager/src/makefile.win32
4 files changed, 4 insertions(+), 0 deletions(-)
===================================================================
@@ -7,6 +7,10 @@ PREFIX = C:/libs
RM = del
-include ../../localwin32.mk
+ifdef MSYS
+RM = rm -f
+endif
+
COMPLIB=tagmanager.a
REGEX_DEFINES = -DHAVE_REGCOMP -DSTDC_HEADERS=1
@@ Diff output truncated at 100000 characters. @@
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).
More information about the Commits
mailing list