SF.net SVN: geany: [1689] trunk

[eht16 at users.sourceforge.net]

Revision: 1689
          http://svn.sourceforge.net/geany/?rev=1689&view=rev
Author:   eht16
Date:     2007-07-11 08:27:57 -0700 (Wed, 11 Jul 2007)

Log Message:
-----------
Apply patch from Shiv to make build system more compatible with other compilers than gcc.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/THANKS
    trunk/configure.in
    trunk/plugins/Makefile.am
    trunk/scintilla/Makefile.am
    trunk/src/Makefile.am
    trunk/tagmanager/Makefile.am

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-07-11 15:01:24 UTC (rev 1688)
+++ trunk/ChangeLog	2007-07-11 15:27:57 UTC (rev 1689)
@@ -1,3 +1,11 @@
+2007-07-11  Enrico Tröger  <enrico.troeger at uvena.de>
+
+ * THANKS, configure.in, plugins/Makefile.am, scintilla/Makefile.am,
+   src/Makefile.am, tagmanager/Makefile.am:
+   Apply patch from Shiv to make build system more compatible with other
+   compilers than gcc.
+
+
 2007-07-11  Nick Treleaven  <nick.treleaven at btinternet.com>
 
  * src/highlighting.c:

Modified: trunk/THANKS
===================================================================
--- trunk/THANKS	2007-07-11 15:01:24 UTC (rev 1688)
+++ trunk/THANKS	2007-07-11 15:27:57 UTC (rev 1689)
@@ -32,6 +32,7 @@
 Dave Moore <wrex006(at)gmail(dot)com> - code navigation patch
 François Cami <francois.cami(at)free(dot)fr>, Guillaume Duviol - tab replacement patch
 Alexander Rodin <rodin(dot)alexander(at)gmail(dot)com> - class builder patch
+Shiv <shivakumar(dot)gn(at)gmail(dot)com> - Sun Studio compiler compatibility patch
 
 Translators:
 ----------------------------------

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2007-07-11 15:01:24 UTC (rev 1688)
+++ trunk/configure.in	2007-07-11 15:27:57 UTC (rev 1689)
@@ -9,6 +9,8 @@
 
 AC_ISC_POSIX
 AC_PROG_CC
+AM_CONDITIONAL(IS_COMPILER_GCC,test x$CC = xgcc)
+
 AM_PROG_CC_STDC
 AC_HEADER_STDC
 AC_PROG_CXX

Modified: trunk/plugins/Makefile.am
===================================================================
--- trunk/plugins/Makefile.am	2007-07-11 15:01:24 UTC (rev 1688)
+++ trunk/plugins/Makefile.am	2007-07-11 15:27:57 UTC (rev 1689)
@@ -3,7 +3,11 @@
 #EXTRA_DIST = \
 	#makefile.win32
 
-AM_CFLAGS = -Wall
+if IS_COMPILER_GCC
+    AM_CFLAGS = -Wall -pipe
+else
+    AM_CFLAGS =
+endif
 
 plugindir = $(libdir)/geany
 

Modified: trunk/scintilla/Makefile.am
===================================================================
--- trunk/scintilla/Makefile.am	2007-07-11 15:01:24 UTC (rev 1688)
+++ trunk/scintilla/Makefile.am	2007-07-11 15:27:57 UTC (rev 1689)
@@ -3,7 +3,7 @@
 
 noinst_LIBRARIES=libscintilla.a
 
-CC=g++
+CC = @CC@
 
 AM_CXXFLAGS = -DGTK -DGTK2 -DSCI_LEXER -DG_THREADS_IMPL_NONE
 
@@ -99,7 +99,7 @@
 libscintilla_a_LIBADD = scintilla-marshal.o
 
 scintilla-marshal.o: scintilla-marshal.c
-	gcc @GTK_CFLAGS@ -c $(srcdir)/scintilla-marshal.c
+	$(CC) @GTK_CFLAGS@ -c $(srcdir)/scintilla-marshal.c
 
 marshallers: scintilla-marshal.list
 	glib-genmarshal --prefix scintilla_marshal scintilla-marshal.list --header > scintilla-marshal.h

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2007-07-11 15:01:24 UTC (rev 1688)
+++ trunk/src/Makefile.am	2007-07-11 15:27:57 UTC (rev 1689)
@@ -60,14 +60,25 @@
 
 else
 # build Geany for all other platforms
-AM_CFLAGS = -Wall -pipe
+if IS_COMPILER_GCC
+    AM_CFLAGS = -Wall -pipe
+else
+    AM_CFLAGS =
+endif
+
 geany_SOURCES = $(SRCS) vte.c vte.h
-geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ -lstdc++ $(INTLLIBS)
 
+if IS_COMPILER_GCC
+    geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ -lstdc++ $(INTLLIBS)
+else
+    geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ -lCrun $(INTLLIBS)
+endif
+
 INCLUDES = \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include @GTK_CFLAGS@
 
 clean-local:
 
+
 endif

Modified: trunk/tagmanager/Makefile.am
===================================================================
--- trunk/tagmanager/Makefile.am	2007-07-11 15:01:24 UTC (rev 1688)
+++ trunk/tagmanager/Makefile.am	2007-07-11 15:27:57 UTC (rev 1689)
@@ -7,7 +7,11 @@
 #	-DGDK_PIXBUF_DEPRECATED \
 #	-DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED
 
-AM_CFLAGS = -Wall
+if IS_COMPILER_GCC
+    AM_CFLAGS = -Wall -pipe
+else
+    AM_CFLAGS =
+endif
 
 noinst_LIBRARIES = libtagmanager.a
 libtagmanager_a_SOURCES =\


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