From 2edb9dbb42932dda5fad34182d1eac8073927431 Mon Sep 17 00:00:00 2001 From: Viktor Odintsev Date: Mon, 11 Dec 2017 04:37:33 +0300 Subject: [PATCH] Move common code to the library in order to fix distcheck --- Makefile.am | 6 ++---- common/Makefile.am | 22 ++++++++++++++++++++++ {xfce4-notifyd => common}/xfce-notify-log.c | 20 +++++++++----------- {xfce4-notifyd => common}/xfce-notify-log.h | 0 configure.ac.in | 1 + panel-plugin/Makefile.am | 5 ++--- panel-plugin/notification-plugin-log.c | 4 ++-- xfce4-notifyd-config/main.c | 3 ++- xfce4-notifyd/xfce-notify-daemon.c | 4 ++-- 9 files changed, 42 insertions(+), 23 deletions(-) create mode 100644 common/Makefile.am rename {xfce4-notifyd => common}/xfce-notify-log.c (93%) rename {xfce4-notifyd => common}/xfce-notify-log.h (100%) diff --git a/Makefile.am b/Makefile.am index 3bd2d46..6a79f25 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,6 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} SUBDIRS = \ icons \ + common \ panel-plugin \ po @@ -33,8 +34,6 @@ xfce4_notifyd_xfce4_notifyd_SOURCES = \ xfce4-notifyd/xfce-notify-daemon.h \ xfce4-notifyd/xfce-notify-enum-types.c \ xfce4-notifyd/xfce-notify-enum-types.h \ - xfce4-notifyd/xfce-notify-log.c \ - xfce4-notifyd/xfce-notify-log.h \ xfce4-notifyd/xfce-notify-marshal.c \ xfce4-notifyd/xfce-notify-marshal.h \ xfce4-notifyd/xfce-notify-window.c \ @@ -42,8 +41,6 @@ xfce4_notifyd_xfce4_notifyd_SOURCES = \ xfce4_notifyd_config_xfce4_notifyd_config_SOURCES = \ xfce4-notifyd-config/main.c \ - xfce4-notifyd/xfce-notify-log.c \ - xfce4-notifyd/xfce-notify-log.h \ xfce4-notifyd-config/xfce4-notifyd-config.ui.h common_cflags = \ @@ -68,6 +65,7 @@ xfce4_notifyd_config_xfce4_notifyd_config_CFLAGS = \ $(common_cflags) common_ldadd = \ + $(top_builddir)/common/libxfce-notifyd-common.la \ $(LIBXFCE4UTIL_LIBS) \ $(XFCONF_LIBS) \ $(LIBXFCE4UI_LIBS) \ diff --git a/common/Makefile.am b/common/Makefile.am new file mode 100644 index 0000000..b838ebf --- /dev/null +++ b/common/Makefile.am @@ -0,0 +1,22 @@ +AM_CPPFLAGS = \ + -I${top_srcdir} + +noinst_LTLIBRARIES = \ + libxfce-notifyd-common.la + +libxfce_notifyd_common_la_SOURCES = \ + xfce-notify-log.c \ + xfce-notify-log.h + +libxfce_notifyd_common_la_CFLAGS = \ + $(LIBXFCE4UI_CFLAGS) \ + $(GTK3_CFLAGS) \ + $(PLATFORM_CFLAGS) + +libxfce_notifyd_common_la_LIBADD = \ + $(LIBXFCE4UI_LIBS) \ + $(GTK3_LIBS) + +libxfce_notifyd_common_la_LDFLAGS = \ + -no-undefined \ + $(PLATFORM_LDFLAGS) diff --git a/xfce4-notifyd/xfce-notify-log.c b/common/xfce-notify-log.c similarity index 93% rename from xfce4-notifyd/xfce-notify-log.c rename to common/xfce-notify-log.c index 1387580..170451e 100644 --- a/xfce4-notifyd/xfce-notify-log.c +++ b/common/xfce-notify-log.c @@ -35,7 +35,6 @@ #include #include -#include "xfce-notify-daemon.h" #include "xfce-notify-log.h" GdkPixbuf * diff --git a/xfce4-notifyd/xfce-notify-log.h b/common/xfce-notify-log.h similarity index 100% rename from xfce4-notifyd/xfce-notify-log.h rename to common/xfce-notify-log.h diff --git a/configure.ac.in b/configure.ac.in index a37da8c..a392a9a 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -149,6 +149,7 @@ AC_OUTPUT( icons/48x48/Makefile icons/scalable/Makefile icons/symbolic/Makefile + common/Makefile panel-plugin/Makefile po/Makefile.in ]) diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index 08b70a8..010f49b 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -19,9 +19,7 @@ libnotification_plugin_la_SOURCES = \ notification-plugin-dialogs.c \ notification-plugin-dialogs.h \ notification-plugin-log.c \ - notification-plugin-log.h \ - ../xfce4-notifyd/xfce-notify-log.c \ - ../xfce4-notifyd/xfce-notify-log.h + notification-plugin-log.h libnotification_plugin_la_CFLAGS = \ $(LIBXFCE4UTIL_CFLAGS) \ @@ -38,6 +36,7 @@ libnotification_plugin_la_LDFLAGS = \ $(PLATFORM_LDFLAGS) libnotification_plugin_la_LIBADD = \ + $(top_builddir)/common/libxfce-notifyd-common.la \ $(LIBXFCE4UTIL_LIBS) \ $(LIBXFCE4UI_LIBS) \ $(LIBXFCE4PANEL_LIBS) \ diff --git a/panel-plugin/notification-plugin-log.c b/panel-plugin/notification-plugin-log.c index ceab6f9..16f449a 100644 --- a/panel-plugin/notification-plugin-log.c +++ b/panel-plugin/notification-plugin-log.c @@ -34,8 +34,8 @@ #include #include -#include -#include "xfce4-notifyd/xfce-notify-log.h" +#include + #include "notification-plugin.h" #include "notification-plugin-log.h" diff --git a/xfce4-notifyd-config/main.c b/xfce4-notifyd-config/main.c index 391095d..9a1aad4 100644 --- a/xfce4-notifyd-config/main.c +++ b/xfce4-notifyd-config/main.c @@ -36,7 +36,8 @@ #include #include -#include "xfce4-notifyd/xfce-notify-log.h" +#include + #include "xfce4-notifyd-config.ui.h" #define KNOWN_APPLICATIONS_PROP "/applications/known_applications" diff --git a/xfce4-notifyd/xfce-notify-daemon.c b/xfce4-notifyd/xfce-notify-daemon.c index fdc5b87..4bff0a4 100644 --- a/xfce4-notifyd/xfce-notify-daemon.c +++ b/xfce4-notifyd/xfce-notify-daemon.c @@ -39,11 +39,11 @@ #include -#include "xfce-notify-gbus.h" +#include +#include "xfce-notify-gbus.h" #include "xfce-notify-daemon.h" #include "xfce-notify-window.h" -#include "xfce-notify-log.h" #include "xfce-notify-marshal.h" #define SPACE 16 -- 2.15.1