commit b6caa37518e438dc6da6351d799e45bbafff06a3
Author: Pierre Wieser <pwieser trychlos org>
Date: Wed Sep 9 18:55:20 2015 +0200
Have a single log domain
configure.ac | 3 -
m4/na-log-domains.m4 | 61 --------------------------
src/core/Makefile.am | 2 +-
src/io-desktop/Makefile.am | 2 +-
src/io-gconf/Makefile.am | 2 +-
src/io-xml/Makefile.am | 2 +-
src/plugin-menu/Makefile.am | 36 ++++++++--------
src/plugin-tracker/Makefile.am | 46 ++++++++++----------
src/test/Makefile.am | 2 +-
src/ui/Makefile.am | 2 +-
src/utils/Makefile.am | 94 ++++++++++++++++++++--------------------
11 files changed, 94 insertions(+), 158 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4d84e59..64619b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,9 +111,6 @@ FMA_TARGET_FILE_MANAGER
AC_SUBST([NAUTILUS_ACTIONS_CFLAGS])
AC_SUBST([NAUTILUS_ACTIONS_LIBS])
-# defines a log domain for each component
-NA_LOG_DOMAINS
-
# print the debug output be printed to the console
AC_DEFINE([NAUTILUS_ACTIONS_DEBUG],["NAUTILUS_ACTIONS_DEBUG"],[Debug environment variable])
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 6d70864..0aa23f2 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -42,7 +42,7 @@ AM_CPPFLAGS += \
-DPKGLIBDIR=\""$(pkglibdir)"\" \
-DPKGLIBEXECDIR=\""$(pkglibexecdir)"\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
- -DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_CORE}\" \
+ -DG_LOG_DOMAIN=\"FMA\" \
-DICON_FNAME=\"$(icon_fname)\" \
-DPKGEXPORTFORMATDIR=\"$(exportformat_datadir)\" \
-DPKGIMPORTMODEDIR=\"$(importmode_datadir)\" \
diff --git a/src/io-desktop/Makefile.am b/src/io-desktop/Makefile.am
index 6763684..49afd8c 100644
--- a/src/io-desktop/Makefile.am
+++ b/src/io-desktop/Makefile.am
@@ -35,7 +35,7 @@ AM_CPPFLAGS += \
-I $(top_srcdir) \
-I $(top_srcdir)/src \
$(NAUTILUS_ACTIONS_CFLAGS) \
- -DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_IO_DESKTOP}\" \
+ -DG_LOG_DOMAIN=\"FMA\" \
-DPROVIDER_ID=\"$(provider_id)\" \
-DPROVIDER_DATADIR=\"$(provider_datadir)\" \
$(NULL)
diff --git a/src/io-gconf/Makefile.am b/src/io-gconf/Makefile.am
index a9ec55e..f638f1e 100644
--- a/src/io-gconf/Makefile.am
+++ b/src/io-gconf/Makefile.am
@@ -37,7 +37,7 @@ AM_CPPFLAGS += \
-I $(top_srcdir) \
-I $(top_srcdir)/src \
$(NAUTILUS_ACTIONS_CFLAGS) \
- -DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_IO_GCONF}\" \
+ -DG_LOG_DOMAIN=\"FMA\" \
-DPROVIDER_ID=\"$(provider_id)\" \
-DPROVIDER_DATADIR=\"$(provider_datadir)\" \
$(NULL)
diff --git a/src/io-xml/Makefile.am b/src/io-xml/Makefile.am
index cbfe94e..0884215 100644
--- a/src/io-xml/Makefile.am
+++ b/src/io-xml/Makefile.am
@@ -35,7 +35,7 @@ AM_CPPFLAGS += \
-I $(top_srcdir) \
-I $(top_srcdir)/src \
$(NAUTILUS_ACTIONS_CFLAGS) \
- -DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_IO_XML}\" \
+ -DG_LOG_DOMAIN=\"FMA\" \
-DPROVIDER_ID=\"$(provider_id)\" \
-DPROVIDER_DATADIR=\"$(provider_datadir)\" \
$(NULL)
diff --git a/src/plugin-menu/Makefile.am b/src/plugin-menu/Makefile.am
index a23eae0..65cec50 100644
--- a/src/plugin-menu/Makefile.am
+++ b/src/plugin-menu/Makefile.am
@@ -26,27 +26,27 @@
# ... and many others (see AUTHORS)
AM_CPPFLAGS += \
- -I $(top_srcdir)
\
- -I $(top_srcdir)/src \
- -DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_PLUGIN_MENU}\" \
- $(NAUTILUS_ACTIONS_CFLAGS) \
+ -I $(top_srcdir) \
+ -I $(top_srcdir)/src \
+ -DG_LOG_DOMAIN=\"FMA\" \
+ $(NAUTILUS_ACTIONS_CFLAGS) \
$(NULL)
lib_sources = \
- fma-menu-module.c
\
- fma-menu-plugin.c
\
- fma-menu-plugin.h
\
+ fma-menu-module.c \
+ fma-menu-plugin.c \
+ fma-menu-plugin.h \
$(NULL)
lib_libadd = \
- $(top_builddir)/src/core/libfma-core.la \
- $(NAUTILUS_ACTIONS_LIBS) \
+ $(top_builddir)/src/core/libfma-core.la \
+ $(NAUTILUS_ACTIONS_LIBS) \
$(NULL)
lib_ldflags = \
- -module
\
- -no-undefined
\
- -avoid-version
\
+ -module \
+ -no-undefined \
+ -avoid-version \
$(NULL)
if HAVE_NAUTILUS
@@ -55,9 +55,9 @@ nautilus_extension_LTLIBRARIES = libfma-nautilus-menu.la
libfma_nautilus_menu_la_SOURCES = $(lib_sources)
libfma_nautilus_menu_la_LIBADD = $(lib_libadd)
libfma_nautilus_menu_la_LDFLAGS = $(lib_ldflags)
-libfma_nautilus_menu_la_CPPFLAGS = $(AM_CPPFLAGS) \
- -DFMA_TARGET_ID=$(NAUTILUS_ID) \
- -DFMA_TARGET_LABEL=\"$(NAUTILUS_LABEL)\" \
+libfma_nautilus_menu_la_CPPFLAGS = $(AM_CPPFLAGS) \
+ -DFMA_TARGET_ID=$(NAUTILUS_ID) \
+ -DFMA_TARGET_LABEL=\"$(NAUTILUS_LABEL)\" \
$(NULL)
endif
@@ -67,8 +67,8 @@ nemo_extension_LTLIBRARIES = libfma-nemo-menu.la
libfma_nemo_menu_la_SOURCES = $(lib_sources)
libfma_nemo_menu_la_LIBADD = $(lib_libadd)
libfma_nemo_menu_la_LDFLAGS = $(lib_ldflags)
-libfma_nemo_menu_la_CPPFLAGS = $(AM_CPPFLAGS) \
- -DFMA_TARGET_ID=$(NEMO_ID) \
- -DFMA_TARGET_LABEL=\"$(NEMO_LABEL)\" \
+libfma_nemo_menu_la_CPPFLAGS = $(AM_CPPFLAGS) \
+ -DFMA_TARGET_ID=$(NEMO_ID) \
+ -DFMA_TARGET_LABEL=\"$(NEMO_LABEL)\" \
$(NULL)
endif
diff --git a/src/plugin-tracker/Makefile.am b/src/plugin-tracker/Makefile.am
index 616f249..6392050 100644
--- a/src/plugin-tracker/Makefile.am
+++ b/src/plugin-tracker/Makefile.am
@@ -26,17 +26,17 @@
# ... and many others (see AUTHORS)
AM_CPPFLAGS += \
- -I $(top_srcdir)
\
- -I $(top_srcdir)/src \
- -DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_PLUGIN_TRACKER}\" \
- $(NAUTILUS_ACTIONS_CFLAGS) \
+ -I $(top_srcdir) \
+ -I $(top_srcdir)/src \
+ -DG_LOG_DOMAIN=\"FMA\" \
+ $(NAUTILUS_ACTIONS_CFLAGS) \
$(NULL)
BUILT_SOURCES =
BUILT_SOURCES += \
- fma-tracker-gdbus.c
\
- fma-tracker-gdbus.h
\
+ fma-tracker-gdbus.c \
+ fma-tracker-gdbus.h \
$(NULL)
fma-tracker-gdbus.c fma-tracker-gdbus.h: fma-tracker-gdbus.xml
@@ -52,24 +52,24 @@ DISTCLEANFILES = \
fma-tracker-gdbus-docs-org.filemanager_actions.DBus.Tracker.Properties1.xml
nodist_libfma_sources = \
- $(BUILT_SOURCES)
\
+ $(BUILT_SOURCES) \
$(NULL)
libfma_sources = \
- fma-tracker-module.c \
- fma-tracker-plugin.h \
- fma-tracker-plugin.c \
+ fma-tracker-module.c \
+ fma-tracker-plugin.h \
+ fma-tracker-plugin.c \
$(NULL)
libfma_ldadd = \
- $(top_builddir)/src/core/libfma-core.la \
- $(NAUTILUS_ACTIONS_LIBS) \
+ $(top_builddir)/src/core/libfma-core.la \
+ $(NAUTILUS_ACTIONS_LIBS) \
$(NULL)
libfma_ldflags = \
- -module
\
- -no-undefined
\
- -avoid-version
\
+ -module \
+ -no-undefined \
+ -avoid-version \
$(NULL)
if HAVE_NAUTILUS
@@ -79,9 +79,9 @@ nodist_libfma_nautilus_tracker_la_SOURCES = $(nodist_libfma_sources)
libfma_nautilus_tracker_la_SOURCES = $(libfma_sources)
libfma_nautilus_tracker_la_LIBADD = $(libfma_ldadd)
libfma_nautilus_tracker_la_LDFLAGS = $(libfma_ldflags)
-libfma_nautilus_tracker_la_CPPFLAGS = $(AM_CPPFLAGS) \
- -DFMA_TARGET_ID=$(NAUTILUS_ID) \
- -DFMA_TARGET_LABEL=\"$(NAUTILUS_LABEL)\" \
+libfma_nautilus_tracker_la_CPPFLAGS = $(AM_CPPFLAGS) \
+ -DFMA_TARGET_ID=$(NAUTILUS_ID) \
+ -DFMA_TARGET_LABEL=\"$(NAUTILUS_LABEL)\" \
$(NULL)
endif
@@ -92,16 +92,16 @@ nodist_libfma_nemo_tracker_la_SOURCES = $(nodist_libfma_sources)
libfma_nemo_tracker_la_SOURCES = $(libfma_sources)
libfma_nemo_tracker_la_LIBADD = $(libfma_ldadd)
libfma_nemo_tracker_la_LDFLAGS = $(libfma_ldflags)
-libfma_nemo_tracker_la_CPPFLAGS = $(AM_CPPFLAGS) \
- -DFMA_TARGET_ID=$(NEMO_ID) \
- -DFMA_TARGET_LABEL=\"$(NEMO_LABEL)\" \
+libfma_nemo_tracker_la_CPPFLAGS = $(AM_CPPFLAGS) \
+ -DFMA_TARGET_ID=$(NEMO_ID) \
+ -DFMA_TARGET_LABEL=\"$(NEMO_LABEL)\" \
$(NULL)
endif
EXTRA_DIST = \
- fma-tracker-gdbus.xml \
+ fma-tracker-gdbus.xml \
$(NULL)
CLEANFILES = \
- $(BUILT_SOURCES)
\
+ $(BUILT_SOURCES) \
$(NULL)
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 68ac2d6..9ff6465 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -44,7 +44,7 @@ AM_CPPFLAGS += \
-I $(top_srcdir)/src \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DPKGLIBDIR=\""$(pkglibdir)"\" \
- -DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_TEST}\" \
+ -DG_LOG_DOMAIN=\"FMA\" \
$(NAUTILUS_ACTIONS_CFLAGS) \
$(NULL)
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index 1251e19..68b7448 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -37,7 +37,7 @@ AM_CPPFLAGS += \
-I $(top_srcdir) \
-I $(top_srcdir)/src \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_NACT}\" \
+ -DG_LOG_DOMAIN=\"FMA\" \
-DPKGUIDIR=\"$(ui_datadir)\" \
$(egg_platform_defines) \
$(NAUTILUS_ACTIONS_CFLAGS) \
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 68f49b6..6f90784 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -26,122 +26,122 @@
# ... and many others (see AUTHORS)
NA_UTILS_LDADD = \
- $(top_builddir)/src/core/libfma-core.la \
- $(NAUTILUS_ACTIONS_LIBS) \
+ $(top_builddir)/src/core/libfma-core.la \
+ $(NAUTILUS_ACTIONS_LIBS) \
$(NULL)
pkglibexec_PROGRAMS = \
- fma-new
\
- fma-print
\
- fma-print-schemas
\
- fma-run
\
- fma-set-conf
\
+ fma-new \
+ fma-print \
+ fma-print-schemas \
+ fma-run \
+ fma-set-conf \
$(NULL)
AM_CPPFLAGS += \
- -I $(top_srcdir)
\
- -I $(top_srcdir)/src \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_UTILS}\" \
- $(NAUTILUS_ACTIONS_CFLAGS) \
+ -I $(top_srcdir) \
+ -I $(top_srcdir)/src \
+ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+ -DG_LOG_DOMAIN=\"FMA\" \
+ $(NAUTILUS_ACTIONS_CFLAGS) \
$(NULL)
fma_new_SOURCES = \
- fma-new.c
\
- console-utils.c
\
- console-utils.h
\
+ fma-new.c \
+ console-utils.c \
+ console-utils.h \
$(NULL)
fma_new_LDADD = \
- $(NA_UTILS_LDADD)
\
+ $(NA_UTILS_LDADD) \
$(NULL)
fma_print_SOURCES = \
- fma-print.c
\
- console-utils.c
\
- console-utils.h
\
+ fma-print.c \
+ console-utils.c \
+ console-utils.h \
$(NULL)
fma_print_LDADD = \
- $(NA_UTILS_LDADD)
\
+ $(NA_UTILS_LDADD) \
$(NULL)
BUILT_SOURCES =
BUILT_SOURCES += \
- fma-run-bindings.c
\
- fma-run-bindings.h
\
+ fma-run-bindings.c \
+ fma-run-bindings.h \
$(NULL)
fma-run-bindings.c fma-run-bindings.h: $(top_srcdir)/src/plugin-tracker/fma-tracker-gdbus.xml
gdbus-codegen \
--interface-prefix org.filemanager_actions.DBus.Tracker. \
- --generate-c-code fma-run-bindings \
- --c-namespace FMA_Tracker_GDBus \
- --c-generate-object-manager \
+ --generate-c-code fma-run-bindings \
+ --c-namespace FMA_Tracker_GDBus \
+ --c-generate-object-manager \
$<
nodist_fma_run_SOURCES = \
- $(BUILT_SOURCES)
\
+ $(BUILT_SOURCES) \
$(NULL)
fma_run_SOURCES = \
- fma-run.c \
- console-utils.c
\
- console-utils.h
\
+ fma-run.c \
+ console-utils.c \
+ console-utils.h \
$(NULL)
fma_run_LDADD = \
- $(NA_UTILS_LDADD)
\
+ $(NA_UTILS_LDADD) \
$(NULL)
fma_print_schemas_SOURCES = \
- fma-print-schemas.c
\
- console-utils.c
\
- console-utils.h
\
+ fma-print-schemas.c \
+ console-utils.c \
+ console-utils.h \
$(NULL)
fma_print_schemas_LDADD = \
- $(NA_UTILS_LDADD)
\
+ $(NA_UTILS_LDADD) \
$(NULL)
fma_set_conf_SOURCES = \
- fma-set-conf.c
\
- console-utils.c
\
- console-utils.h
\
+ fma-set-conf.c \
+ console-utils.c \
+ console-utils.h \
$(NULL)
fma_set_conf_LDADD = \
- $(NA_UTILS_LDADD)
\
+ $(NA_UTILS_LDADD) \
$(NULL)
EXTRA_DIST = \
- fma-gconf2key.sh.in
\
+ fma-gconf2key.sh.in \
$(NULL)
CLEANFILES = \
- $(BUILT_SOURCES)
\
+ $(BUILT_SOURCES) \
$(NULL)
# If GConf support is enabled, then also build the migration tools
if HAVE_GCONF
pkglibexec_PROGRAMS += \
- fma-delete-xmltree
\
+ fma-delete-xmltree \
$(NULL)
fma_delete_xmltree_SOURCES = \
- fma-delete-xmltree.c \
- console-utils.c
\
- console-utils.h
\
+ fma-delete-xmltree.c \
+ console-utils.c \
+ console-utils.h \
$(NULL)
fma_delete_xmltree_LDADD = \
- $(NA_UTILS_LDADD)
\
+ $(NA_UTILS_LDADD) \
$(NULL)
pkglibexec_SCRIPTS = \
- fma-gconf2key.sh
\
+ fma-gconf2key.sh \
$(NULL)
do_subst = sed \
@@ -159,6 +159,6 @@ do_subst = sed \
chmod a+x $@
CLEANFILES += \
- $(pkglibexec_SCRIPTS) \
+ $(pkglibexec_SCRIPTS) \
$(NULL)
endif