SF.net SVN: geany: [1644] trunk

[eht16 at users.sourceforge.net]

Revision: 1644
          http://svn.sourceforge.net/geany/?rev=1644&view=rev
Author:   eht16
Date:     2007-06-26 11:08:00 -0700 (Tue, 26 Jun 2007)

Log Message:
-----------
Change label of GTK check in configure.in from PACKAGE to GTK (only cosmetic).

Modified Paths:
--------------
    trunk/ChangeLog
    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-06-26 16:17:16 UTC (rev 1643)
+++ trunk/ChangeLog	2007-06-26 18:08:00 UTC (rev 1644)
@@ -18,6 +18,10 @@
    Add option to set a default encoding when opening files and disable
    auto detection of the file encoding.
  * geany.nsi: Change file encoding from ISO-8859-1 to UTF-8.
+ * configure.in, plugins/Makefile.am, scintilla/Makefile.am,
+   src/Makefile.am, tagmanager/Makefile.am:
+   Change label of GTK check in configure.in from PACKAGE to GTK
+   (only cosmetic).
 
 
 2007-06-25  Enrico Tröger  <enrico.troeger at uvena.de>

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2007-06-26 16:17:16 UTC (rev 1643)
+++ trunk/configure.in	2007-06-26 18:08:00 UTC (rev 1644)
@@ -73,9 +73,9 @@
 
 # GTK checks
 pkg_modules="gtk+-2.0 >= 2.6.0"
-PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
-AC_SUBST(PACKAGE_CFLAGS)
-AC_SUBST(PACKAGE_LIBS)
+PKG_CHECK_MODULES(GTK, [$pkg_modules])
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(GTK_LIBS)
 
 # socket support
 AC_ARG_ENABLE(socket, AC_HELP_STRING([--enable-socket],[enable if you want to detect a running instance [[default=yes]]]),

Modified: trunk/plugins/Makefile.am
===================================================================
--- trunk/plugins/Makefile.am	2007-06-26 16:17:16 UTC (rev 1643)
+++ trunk/plugins/Makefile.am	2007-06-26 18:08:00 UTC (rev 1644)
@@ -21,7 +21,7 @@
 
 demoplugin_la_SOURCES    = demoplugin.c
 
-demoplugin_la_LIBADD    = $(PACKAGE_LIBS)
+demoplugin_la_LIBADD    = $(GTK_LIBS)
 
 endif # PLUGINS
 
@@ -30,7 +30,7 @@
 	-I$(top_builddir)/src \
 	-I$(top_srcdir)/tagmanager/include \
 	-I$(top_srcdir)/scintilla/include \
-	$(PACKAGE_CFLAGS) \
+	$(GTK_CFLAGS) \
 	$(PLUGIN_CFLAGS)
 
 #

Modified: trunk/scintilla/Makefile.am
===================================================================
--- trunk/scintilla/Makefile.am	2007-06-26 16:17:16 UTC (rev 1643)
+++ trunk/scintilla/Makefile.am	2007-06-26 18:08:00 UTC (rev 1644)
@@ -92,15 +92,15 @@
 libscintilla_a_SOURCES = $(SRCS)
 
 if MINGW
-INCLUDES=-I$(top_srcdir) -I$(srcdir)/include -I/usr/local/cross-tools/include @PACKAGE_CFLAGS@
+INCLUDES=-I$(top_srcdir) -I$(srcdir)/include -I/usr/local/cross-tools/include @GTK_CFLAGS@
 else
-INCLUDES=-I$(top_srcdir) -I$(srcdir)/include @PACKAGE_CFLAGS@
+INCLUDES=-I$(top_srcdir) -I$(srcdir)/include @GTK_CFLAGS@
 endif
 
 libscintilla_a_LIBADD = scintilla-marshal.o
 
 scintilla-marshal.o: scintilla-marshal.c
-	gcc @PACKAGE_CFLAGS@ -c $(srcdir)/scintilla-marshal.c
+	gcc @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-06-26 16:17:16 UTC (rev 1643)
+++ trunk/src/Makefile.am	2007-06-26 18:08:00 UTC (rev 1644)
@@ -43,14 +43,14 @@
 WINDRES = /usr/local/cross-tools/bin/i386-mingw32msvc-windres
 
 geany_SOURCES = $(SRCS) win32.c win32.h
-geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a -lstdc++ @PACKAGE_LIBS@ \
+geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a -lstdc++ @GTK_LIBS@ \
 			$(INTLLIBS) -lgdi32 -limm32 -lshell32 -lole32 -luuid -liberty -lcomdlg32 -lcomctl32 \
 			geany_private.res
 AM_CFLAGS = -Wall -pipe -mms-bitfields
 geany_LDFLAGS =	-mwindows
 
 INCLUDES = -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include -DENABLE_NLS \
-           -I/usr/local/cross-tools/include @PACKAGE_CFLAGS@
+           -I/usr/local/cross-tools/include @GTK_CFLAGS@
 
 geany_windres.res:
 	$(WINDRES) -i ../geany_private.rc --input-format=rc -o geany_private.res -O coff;
@@ -62,11 +62,11 @@
 # build Geany for all other platforms
 AM_CFLAGS = -Wall -pipe
 geany_SOURCES = $(SRCS) vte.c vte.h
-geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @PACKAGE_LIBS@ -lstdc++ $(INTLLIBS)
+geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ -lstdc++ $(INTLLIBS)
 
 INCLUDES = \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-	-I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include @PACKAGE_CFLAGS@
+	-I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include @GTK_CFLAGS@
 
 clean-local:
 

Modified: trunk/tagmanager/Makefile.am
===================================================================
--- trunk/tagmanager/Makefile.am	2007-06-26 16:17:16 UTC (rev 1643)
+++ trunk/tagmanager/Makefile.am	2007-06-26 18:08:00 UTC (rev 1644)
@@ -2,7 +2,7 @@
 # $Id$
 
 SUBDIRS = include
-INCLUDES = -I$(srcdir)/include $(PACKAGE_CFLAGS)
+INCLUDES = -I$(srcdir)/include $(GTK_CFLAGS)
 #	-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
 #	-DGDK_PIXBUF_DEPRECATED \
 #	-DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED


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