Merge branch 'dbuslog-ext' into 'master'

Make dbuslog an external plugin See merge request mer-core/nfcd!46
sailfishos · Nov 2, 2020 · 670b7c3 · 670b7c3
2 parents a79e345 + 9112838
commit 670b7c3
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 442 deletions.
diff --git a/plugins/Makefile b/plugins/Makefile
@@ -231,40 +231,6 @@ $(RELEASE_DBUS_HANDLERS_BUILD_DIR):
 $(COVERAGE_DBUS_HANDLERS_BUILD_DIR):
 	mkdir -p $@
 
-#
-# D-Bus log plugin
-#
-
-PKGS += libdbuslogserver-gio
-
-DBUS_LOG_DIR = dbus_log
-DBUS_LOG_SRC = dbus_log_plugin.c
-
-DEBUG_DBUS_LOG_BUILD_DIR = $(DEBUG_BUILD_DIR)/$(DBUS_LOG_DIR)
-RELEASE_DBUS_LOG_BUILD_DIR = $(RELEASE_BUILD_DIR)/$(DBUS_LOG_DIR)
-COVERAGE_DBUS_LOG_BUILD_DIR = $(COVERAGE_BUILD_DIR)/$(DBUS_LOG_DIR)
-
-DEBUG_DBUS_LOG_OBJS = $(DBUS_LOG_SRC:%.c=$(DEBUG_DBUS_LOG_BUILD_DIR)/%.o)
-RELEASE_DBUS_LOG_OBJS = $(DBUS_LOG_SRC:%.c=$(RELEASE_DBUS_LOG_BUILD_DIR)/%.o)
-COVERAGE_DBUS_LOG_OBJS = $(DBUS_LOG_SRC:%.c=$(COVERAGE_DBUS_LOG_BUILD_DIR)/%.o)
-
-DEBUG_OBJS += $(DEBUG_DBUS_LOG_OBJS)
-RELEASE_OBJS += $(RELEASE_DBUS_LOG_OBJS)
-COVERAGE_OBJS += $(COVERAGE_DBUS_LOG_OBJS)
-
-$(DEBUG_DBUS_LOG_OBJS): | $(DEBUG_DBUS_LOG_BUILD_DIR)
-$(RELEASE_DBUS_LOG_OBJS): | $(RELEASE_DBUS_LOG_BUILD_DIR)
-$(COVERAGE_DBUS_LOG_OBJS): | $(COVERAGE_DBUS_LOG_BUILD_DIR)
-
-$(DEBUG_DBUS_LOG_BUILD_DIR):
-	mkdir -p $@
-
-$(RELEASE_DBUS_LOG_BUILD_DIR):
-	mkdir -p $@
-
-$(COVERAGE_DBUS_LOG_BUILD_DIR):
-	mkdir -p $@
-
 #
 # Tools and flags
 #

diff --git a/plugins/dbus_log/README b/plugins/dbus_log/README
diff --git a/plugins/dbus_log/dbus_log_plugin.c b/plugins/dbus_log/dbus_log_plugin.c