SF.net SVN: geany:[4954] trunk

[eht16 at users.sourceforge.net]

Revision: 4954
          http://geany.svn.sourceforge.net/geany/?rev=4954&view=rev
Author:   eht16
Date:     2010-05-25 19:49:49 +0000 (Tue, 25 May 2010)

Log Message:
-----------
Pass G_LOG_DOMAIN to source files for better logging.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/plugins/Makefile.am
    trunk/src/Makefile.am
    trunk/tagmanager/Makefile.am
    trunk/wscript

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-05-24 09:59:16 UTC (rev 4953)
+++ trunk/ChangeLog	2010-05-25 19:49:49 UTC (rev 4954)
@@ -1,3 +1,10 @@
+2010-05-25  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * plugins/Makefile.am, src/Makefile.am, tagmanager/Makefile.am,
+   wscript:
+   Pass G_LOG_DOMAIN to source files for better logging.
+
+
 2010-05-24  Frank Lanitz  <frank at frank.uvena.de>
 
  * THANKS, src/about.c:
@@ -2,3 +9,3 @@
    Update of translation credits to reflect a change on Spanish
-   translation team better. 
+   translation team better.
 

Modified: trunk/plugins/Makefile.am
===================================================================
--- trunk/plugins/Makefile.am	2010-05-24 09:59:16 UTC (rev 4953)
+++ trunk/plugins/Makefile.am	2010-05-25 19:49:49 UTC (rev 4954)
@@ -84,7 +84,14 @@
 filebrowser_la_SOURCES   = filebrowser.c
 splitwindow_la_SOURCES   = splitwindow.c
 
-# instead of linking against all in $(GTK_LIBS), we link only against needed libs
+demoplugin_la_CFLAGS    = -DG_LOG_DOMAIN=\""Demoplugin"\"
+classbuilder_la_CFLAGS  = -DG_LOG_DOMAIN=\""Classbuilder"\"
+htmlchars_la_CFLAGS     = -DG_LOG_DOMAIN=\""HTMLChars"\"
+export_la_CFLAGS        = -DG_LOG_DOMAIN=\""Export"\"
+saveactions_la_CFLAGS   = -DG_LOG_DOMAIN=\""SaveActions"\"
+filebrowser_la_CFLAGS   = -DG_LOG_DOMAIN=\""FileBrowser"\"
+splitwindow_la_CFLAGS   = -DG_LOG_DOMAIN=\""SplitWindow"\"
+
 demoplugin_la_LIBADD    = $(GTK_LIBS)
 classbuilder_la_LIBADD  = $(GTK_LIBS)
 htmlchars_la_LIBADD     = $(GTK_LIBS)

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2010-05-24 09:59:16 UTC (rev 4953)
+++ trunk/src/Makefile.am	2010-05-25 19:49:49 UTC (rev 4954)
@@ -95,7 +95,8 @@
 			-DGEANY_LOCALEDIR=\"\" \
 			-DGEANY_PREFIX=\"\" \
 			-DGEANY_PRIVATE \
-			-DGTK
+			-DGTK \
+			-DG_LOG_DOMAIN=\""Geany"\"
 
 geany_LDFLAGS =	-mwindows -mms-bitfields
 
@@ -120,7 +121,8 @@
 			-DGEANY_LOCALEDIR=\""$(localedir)"\" \
 			-DGEANY_PREFIX=\""$(prefix)"\" \
 			-DGEANY_PRIVATE \
-			-DGTK
+			-DGTK \
+			-DG_LOG_DOMAIN=\""Geany"\"
 
 clean-local:
 

Modified: trunk/tagmanager/Makefile.am
===================================================================
--- trunk/tagmanager/Makefile.am	2010-05-24 09:59:16 UTC (rev 4953)
+++ trunk/tagmanager/Makefile.am	2010-05-25 19:49:49 UTC (rev 4954)
@@ -3,10 +3,9 @@
 
 SUBDIRS = include
 INCLUDES = -I$(srcdir)/include $(GTK_CFLAGS)
-#	-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
-#	-DGDK_PIXBUF_DEPRECATED \
-#	-DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED
 
+AM_CFLAGS = -DG_LOG_DOMAIN=\""Tagmanager"\"
+
 # regex.c is the GNU regex implementation needed for Windows
 EXTRA_DIST = regex.c
 

Modified: trunk/wscript
===================================================================
--- trunk/wscript	2010-05-24 09:59:16 UTC (rev 4953)
+++ trunk/wscript	2010-05-25 19:49:49 UTC (rev 4954)
@@ -340,6 +340,7 @@
 			features				= 'cc cshlib',
 			source					= 'plugins/' + plugin_name + '.c',
 			includes				= '. plugins/ src/ scintilla/include tagmanager/include',
+			defines					= 'G_LOG_DOMAIN="%s"' % plugin_name,
 			target					= plugin_name,
 			uselib					= 'GTK',
 			install_path			= instpath
@@ -355,6 +356,7 @@
 		name			= 'tagmanager',
 		target			= 'tagmanager',
 		includes		= '. tagmanager/ tagmanager/include/',
+		defines			= 'G_LOG_DOMAIN="Tagmanager"',
 		uselib			= 'GTK',
 		install_path	= None # do not install this library
 	)
@@ -382,6 +384,7 @@
 		target			= 'geany',
 		source			= geany_sources,
 		includes		= '. src/ scintilla/include/ tagmanager/include/',
+		defines			= 'G_LOG_DOMAIN="Geany"',
 		uselib			= 'GTK GIO WIN32',
 		uselib_local	= 'scintilla tagmanager',
 		add_objects		= 'geany-rc' if is_win32 else None


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