From 809128547f1bfe79a9a77cdf446e3608abd1c283 Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Thu, 21 Feb 2013 18:12:52 +0000
Subject: Use G_LOG_DOMAIN in all library components

---
 client/Makefile.am    | 2 +-
 common/Makefile.am    | 2 +-
 dbus-1/Makefile.am    | 2 +-
 engine/Makefile.am    | 2 +-
 gdbus/Makefile.am     | 4 ++--
 gsettings/Makefile.am | 2 +-
 gvdb/Makefile.am      | 2 +-
 shm/Makefile.am       | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/Makefile.am b/client/Makefile.am
index dfb910d..f21c8b2 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -20,7 +20,7 @@ dconfinclude_HEADERS = dconf.h
 dconfclientinclude_HEADERS = dconf-client.h
 dconfclientincludedir = $(dconfincludedir)/client
 
-libdconf_client_a_CFLAGS = $(gio_CFLAGS)
+libdconf_client_a_CFLAGS = $(gio_CFLAGS) -DG_LOG_DOMAIN=\"dconf\"
 libdconf_client_a_SOURCES = \
 	dconf-client.c
 
diff --git a/common/Makefile.am b/common/Makefile.am
index bb24585..0400298 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -7,7 +7,7 @@ dconfcommoninclude_HEADERS = \
 
 noinst_LIBRARIES = libdconf-common.a libdconf-common-shared.a libdconf-common-hidden.a
 
-libdconf_common_a_CFLAGS = $(glib_CFLAGS)
+libdconf_common_a_CFLAGS = $(glib_CFLAGS) -DG_LOG_DOMAIN=\"dconf\"
 libdconf_common_a_SOURCES = \
 	dconf-changeset.c	\
 	dconf-paths.c
diff --git a/dbus-1/Makefile.am b/dbus-1/Makefile.am
index 7444c17..4e60d01 100644
--- a/dbus-1/Makefile.am
+++ b/dbus-1/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.gtester
 
 noinst_LIBRARIES = libdconf-libdbus-1.a libdconf-libdbus-1-shared.a
 
-libdconf_libdbus_1_a_CFLAGS = $(dbus_CFLAGS) $(glib_CFLAGS)
+libdconf_libdbus_1_a_CFLAGS = $(dbus_CFLAGS) $(glib_CFLAGS) -DG_LOG_DOMAIN=\"dconf\"
 libdconf_libdbus_1_a_SOURCES = \
 	dconf-libdbus-1.h		\
 	dconf-libdbus-1.c
diff --git a/engine/Makefile.am b/engine/Makefile.am
index 8061ba9..5266f27 100644
--- a/engine/Makefile.am
+++ b/engine/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.gtester
 
 noinst_LIBRARIES = libdconf-engine.a libdconf-engine-shared.a
 
-libdconf_engine_a_CFLAGS = $(glib_CFLAGS)
+libdconf_engine_a_CFLAGS = $(glib_CFLAGS) -DG_LOG_DOMAIN=\"dconf\"
 libdconf_engine_a_SOURCES = \
 	dconf-engine-profile.h		\
 	dconf-engine-profile.c		\
diff --git a/gdbus/Makefile.am b/gdbus/Makefile.am
index cee235c..d3f0a6c 100644
--- a/gdbus/Makefile.am
+++ b/gdbus/Makefile.am
@@ -6,14 +6,14 @@ noinst_LIBRARIES = \
 	libdconf-gdbus-filter.a			\
 	libdconf-gdbus-filter-shared.a
 
-libdconf_gdbus_thread_a_CFLAGS = $(gio_CFLAGS)
+libdconf_gdbus_thread_a_CFLAGS = $(gio_CFLAGS) -DG_LOG_DOMAIN=\"dconf\"
 libdconf_gdbus_thread_a_SOURCES = \
 	dconf-gdbus-thread.c
 
 libdconf_gdbus_thread_shared_a_CFLAGS = $(libdconf_gdbus_thread_a_CFLAGS) -fPIC -DPIC
 libdconf_gdbus_thread_shared_a_SOURCES = $(libdconf_gdbus_thread_a_SOURCES)
 
-libdconf_gdbus_filter_a_CFLAGS = $(gio_CFLAGS)
+libdconf_gdbus_filter_a_CFLAGS = $(gio_CFLAGS) -DG_LOG_DOMAIN=\"dconf\"
 libdconf_gdbus_filter_a_SOURCES = \
 	dconf-gdbus-filter.c
 
diff --git a/gsettings/Makefile.am b/gsettings/Makefile.am
index 2a2be8f..4f6e66b 100644
--- a/gsettings/Makefile.am
+++ b/gsettings/Makefile.am
@@ -10,7 +10,7 @@ libdconfsettings_so_LDADD = \
 	../shm/libdconf-shm-shared.a			\
 	$(gio_LIBS)
 
-libdconfsettings_so_CFLAGS = $(gio_CFLAGS) -fPIC -DPIC
+libdconfsettings_so_CFLAGS = $(gio_CFLAGS) -fPIC -DPIC -DG_LOG_DOMAIN=\"dconf\"
 libdconfsettings_so_LDFLAGS = -shared
 libdconfsettings_so_SOURCES = \
 	dconfsettingsbackend.c
diff --git a/gvdb/Makefile.am b/gvdb/Makefile.am
index 24aaf1e..7194b2f 100644
--- a/gvdb/Makefile.am
+++ b/gvdb/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.gtester
 
 noinst_LIBRARIES = libgvdb.a libgvdb-shared.a
 
-libgvdb_a_CFLAGS = $(glib_CFLAGS)
+libgvdb_a_CFLAGS = $(glib_CFLAGS) -DG_LOG_DOMAIN=\"gvdb\ \(via\ dconf\)\"
 libgvdb_a_SOURCES = \
 	gvdb-format.h	\
 	gvdb-builder.h	\
diff --git a/shm/Makefile.am b/shm/Makefile.am
index ffa2fd3..936f88e 100644
--- a/shm/Makefile.am
+++ b/shm/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.gtester
 
 noinst_LIBRARIES = libdconf-shm.a libdconf-shm-shared.a
 
-libdconf_shm_a_CFLAGS = $(glib_CFLAGS)
+libdconf_shm_a_CFLAGS = $(glib_CFLAGS) -DG_LOG_DOMAIN=\"dconf\"
 libdconf_shm_a_SOURCES = \
 	dconf-shm.h		\
 	dconf-shm.c
-- 
cgit v1.2.1