From 0d372c1a0ae345d8ebbc69c52e9d55165e766109 Mon Sep 17 00:00:00 2001 From: rbuj Date: Mon, 27 Jan 2020 12:53:27 +0100 Subject: automake: do not include CFLAGS in CPPFLAGS --- sendto/plugins/caja-burn/Makefile.am | 35 +++++++++++------- sendto/plugins/caja-burn/caja-burn.c | 2 +- sendto/plugins/emailclient/Makefile.am | 34 ++++++++++++------ sendto/plugins/emailclient/emailclient.c | 2 +- sendto/plugins/gajim/Makefile.am | 34 ++++++++++++------ sendto/plugins/gajim/gajim.c | 2 +- sendto/plugins/pidgin/Makefile.am | 42 ++++++++++++++-------- sendto/plugins/pidgin/pidgin.c | 2 +- sendto/plugins/removable-devices/Makefile.am | 35 +++++++++++------- .../plugins/removable-devices/removable-devices.c | 2 +- sendto/plugins/upnp/Makefile.am | 35 +++++++++++------- sendto/plugins/upnp/upnp.c | 2 +- 12 files changed, 149 insertions(+), 78 deletions(-) (limited to 'sendto/plugins') diff --git a/sendto/plugins/caja-burn/Makefile.am b/sendto/plugins/caja-burn/Makefile.am index 00f95c2..10c0a65 100644 --- a/sendto/plugins/caja-burn/Makefile.am +++ b/sendto/plugins/caja-burn/Makefile.am @@ -1,20 +1,31 @@ -plugindir = $(libdir)/caja-sendto/plugins +NULL = + +AM_CPPFLAGS = \ + $(DISABLE_DEPRECATED_CPPFLAGS) \ + -DMATELOCALEDIR=\""$(datadir)/locale"\" \ + -I$(top_builddir) \ + -I$(top_srcdir)/sendto \ + $(NULL) -AM_CPPFLAGS = \ - -DDATADIR=\"$(datadir)\" \ - -DICONDIR=\"$(icondir)\" \ - -DLOCALEDIR="\"$(datadir)/locale\"" \ - -I$(top_srcdir)/sendto \ - -I$(top_builddir) \ - -I$(srcdir)/../ \ - $(SENDTO_CFLAGS) \ +AM_CFLAGS = \ $(WARN_CFLAGS) \ - $(DISABLE_DEPRECATED) \ - $(GIO_CFLAGS) + $(SENDTO_CFLAGS) \ + $(NULL) + +plugindir = $(libdir)/caja-sendto/plugins plugin_LTLIBRARIES = libnstburn.la libnstburn_la_SOURCES = caja-burn.c +libnstburn_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DDATADIR=\"$(datadir)\" \ + -DICONDIR=\"$(icondir)\" \ + -I$(srcdir)/../ \ + $(NULL) +libnstburn_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(GIO_CFLAGS) \ + $(NULL) libnstburn_la_LDFLAGS = -module -avoid-version libnstburn_la_LIBADD = $(GIO_LIBS) $(SENDTO_LIBS) $(builddir)/../libnstcommon.la - diff --git a/sendto/plugins/caja-burn/caja-burn.c b/sendto/plugins/caja-burn/caja-burn.c index 9de3534..4470dff 100644 --- a/sendto/plugins/caja-burn/caja-burn.c +++ b/sendto/plugins/caja-burn/caja-burn.c @@ -46,7 +46,7 @@ gboolean init (NstPlugin *plugin) g_print ("Init caja burn plugin\n"); - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); it = gtk_icon_theme_get_default (); diff --git a/sendto/plugins/emailclient/Makefile.am b/sendto/plugins/emailclient/Makefile.am index c4af752..37c08e2 100644 --- a/sendto/plugins/emailclient/Makefile.am +++ b/sendto/plugins/emailclient/Makefile.am @@ -1,18 +1,30 @@ -plugindir = $(libdir)/caja-sendto/plugins +NULL = + +AM_CPPFLAGS = \ + $(DISABLE_DEPRECATED_CPPFLAGS) \ + -DMATELOCALEDIR=\""$(datadir)/locale"\" \ + -I$(top_builddir) \ + -I$(top_srcdir)/sendto \ + $(NULL) -AM_CPPFLAGS = \ - -DDATADIR=\"$(datadir)\" \ - -DICONDIR=\"$(icondir)\" \ - -DLOCALEDIR="\"$(datadir)/locale\"" \ - -I$(top_srcdir)/sendto \ - -I$(top_builddir) \ - $(SENDTO_CFLAGS) \ - $(EMAILCLIENT_CFLAGS) \ - $(DISABLE_DEPRECATED) \ - $(WARN_CFLAGS) +AM_CFLAGS = \ + $(WARN_CFLAGS) \ + $(SENDTO_CFLAGS) \ + $(NULL) + +plugindir = $(libdir)/caja-sendto/plugins plugin_LTLIBRARIES = libnstemailclient.la libnstemailclient_la_SOURCES = emailclient.c +libnstemailclient_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DDATADIR=\"$(datadir)\" \ + -DICONDIR=\"$(icondir)\" \ + $(NULL) +libnstemailclient_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(EMAILCLIENT_CFLAGS) \ + $(NULL) libnstemailclient_la_LDFLAGS = -module -avoid-version libnstemailclient_la_LIBADD = $(SENDTO_LIBS) $(EMAILCLIENT_LIBS) diff --git a/sendto/plugins/emailclient/emailclient.c b/sendto/plugins/emailclient/emailclient.c index 9d1e369..c116933 100644 --- a/sendto/plugins/emailclient/emailclient.c +++ b/sendto/plugins/emailclient/emailclient.c @@ -78,7 +78,7 @@ init (NstPlugin *plugin) g_print ("Init email client plugin\n"); - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); app_info = g_app_info_get_default_for_uri_scheme ("mailto"); diff --git a/sendto/plugins/gajim/Makefile.am b/sendto/plugins/gajim/Makefile.am index c39a3c0..9bf5f5f 100644 --- a/sendto/plugins/gajim/Makefile.am +++ b/sendto/plugins/gajim/Makefile.am @@ -1,19 +1,31 @@ -plugindir = $(libdir)/caja-sendto/plugins +NULL = + +AM_CPPFLAGS = \ + $(DISABLE_DEPRECATED_CPPFLAGS) \ + -DMATELOCALEDIR=\""$(datadir)/locale"\" \ + -I$(top_builddir) \ + -I$(top_srcdir)/sendto \ + $(NULL) -AM_CPPFLAGS = \ - -DDATADIR=\"$(datadir)\" \ - -DICONDIR=\"$(icondir)\" \ - -DLOCALEDIR="\"$(datadir)/locale\"" \ - -I$(top_srcdir)/sendto \ - -I$(top_builddir) \ - $(SENDTO_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(DISABLE_DEPRECATED) \ - $(WARN_CFLAGS) +AM_CFLAGS = \ + $(WARN_CFLAGS) \ + $(SENDTO_CFLAGS) \ + $(NULL) + +plugindir = $(libdir)/caja-sendto/plugins plugin_LTLIBRARIES = libnstgajim.la libnstgajim_la_SOURCES = gajim.c +libnstgajim_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DDATADIR=\"$(datadir)\" \ + -DICONDIR=\"$(icondir)\" \ + $(NULL) +libnstgajim_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(NULL) libnstgajim_la_LDFLAGS = -module -avoid-version libnstgajim_la_LIBADD = $(DBUS_LIBS) $(SENDTO_LIBS) diff --git a/sendto/plugins/gajim/gajim.c b/sendto/plugins/gajim/gajim.c index b0dd44f..cfa97f1 100644 --- a/sendto/plugins/gajim/gajim.c +++ b/sendto/plugins/gajim/gajim.c @@ -259,7 +259,7 @@ init (NstPlugin *plugin) { g_print ("Init gajim plugin\n"); - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); /* connect to gajim dbus service */ diff --git a/sendto/plugins/pidgin/Makefile.am b/sendto/plugins/pidgin/Makefile.am index bcfe1d3..e6e64bc 100644 --- a/sendto/plugins/pidgin/Makefile.am +++ b/sendto/plugins/pidgin/Makefile.am @@ -1,20 +1,34 @@ -plugindir = $(libdir)/caja-sendto/plugins +NULL = + +AM_CPPFLAGS = \ + $(DISABLE_DEPRECATED_CPPFLAGS) \ + -DMATELOCALEDIR=\""$(datadir)/locale"\" \ + -I$(top_builddir) \ + -I$(top_srcdir)/sendto \ + $(NULL) -AM_CPPFLAGS = \ - -DDATADIR=\"$(datadir)\" \ - -DICONDIR=\"$(icondir)\" \ - -DLOCALEDIR="\"$(datadir)/locale\"" \ - -I$(top_srcdir)/sendto \ - -I$(top_builddir) \ - $(SENDTO_CFLAGS) \ - $(NST_EBOOK_CFLAGS) \ - $(PIDGIN_CFLAGS) \ - $(DISABLE_DEPRECATED) \ - $(WARN_CFLAGS) +AM_CFLAGS = \ + $(WARN_CFLAGS) \ + $(SENDTO_CFLAGS) \ + $(NULL) + +plugindir = $(libdir)/caja-sendto/plugins plugin_LTLIBRARIES = libnstpidgin.la libnstpidgin_la_SOURCES = pidgin.c +libnstpidgin_la_CPPFLAG = \ + $(AM_CFLAGS) \ + -DDATADIR=\"$(datadir)\" \ + -DICONDIR=\"$(icondir)\" \ + $(NULL) +libnstpidgin_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(NST_EBOOK_CFLAGS) \ + $(PIDGIN_CFLAGS) \ + $(NULL) libnstpidgin_la_LDFLAGS = -module -avoid-version -libnstpidgin_la_LIBADD = $(PIDGIN_LIBS) $(SENDTO_LIBS) - +libnstpidgin_la_LIBADD = \ + $(PIDGIN_LIBS) \ + $(SENDTO_LIBS) \ + $(NUll) diff --git a/sendto/plugins/pidgin/pidgin.c b/sendto/plugins/pidgin/pidgin.c index d555893..2630f41 100644 --- a/sendto/plugins/pidgin/pidgin.c +++ b/sendto/plugins/pidgin/pidgin.c @@ -79,7 +79,7 @@ init (NstPlugin *plugin) g_print ("Init pidgin plugin\n"); - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); error = NULL; diff --git a/sendto/plugins/removable-devices/Makefile.am b/sendto/plugins/removable-devices/Makefile.am index 797353b..6aa8928 100644 --- a/sendto/plugins/removable-devices/Makefile.am +++ b/sendto/plugins/removable-devices/Makefile.am @@ -1,19 +1,30 @@ -plugindir = $(libdir)/caja-sendto/plugins +NULL = + +AM_CPPFLAGS = \ + $(DISABLE_DEPRECATED_CPPFLAGS) \ + -DMATELOCALEDIR=\""$(datadir)/locale"\" \ + -I$(top_builddir) \ + -I$(top_srcdir)/sendto \ + $(NULL) -AM_CPPFLAGS = \ - -DDATADIR=\"$(datadir)\" \ - -DICONDIR=\"$(icondir)\" \ - -DLOCALEDIR="\"$(datadir)/locale\"" \ - -I$(top_srcdir)/sendto \ - -I$(top_builddir) \ - -I$(srcdir)/../ \ - $(SENDTO_CFLAGS) \ - $(DISABLE_DEPRECATED) \ - $(WARN_CFLAGS) +AM_CFLAGS = \ + $(WARN_CFLAGS) \ + $(SENDTO_CFLAGS) \ + $(NULL) + +plugindir = $(libdir)/caja-sendto/plugins plugin_LTLIBRARIES = libnstremovable_devices.la libnstremovable_devices_la_SOURCES = removable-devices.c +libnstremovable_devices_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DDATADIR=\"$(datadir)\" \ + -DICONDIR=\"$(icondir)\" \ + -I$(srcdir)/../ \ + $(NULL) +libnstremovable_devices_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(NULL) libnstremovable_devices_la_LDFLAGS = -module -avoid-version libnstremovable_devices_la_LIBADD = $(GIO_LIBS) $(SENDTO_LIBS) $(builddir)/../libnstcommon.la - diff --git a/sendto/plugins/removable-devices/removable-devices.c b/sendto/plugins/removable-devices/removable-devices.c index 0ecea14..f8f1445 100644 --- a/sendto/plugins/removable-devices/removable-devices.c +++ b/sendto/plugins/removable-devices/removable-devices.c @@ -147,7 +147,7 @@ init (NstPlugin *plugin) { g_print ("Init removable-devices plugin\n"); - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); vol_monitor = g_volume_monitor_get (); diff --git a/sendto/plugins/upnp/Makefile.am b/sendto/plugins/upnp/Makefile.am index 31a8bd6..9544d49 100644 --- a/sendto/plugins/upnp/Makefile.am +++ b/sendto/plugins/upnp/Makefile.am @@ -1,19 +1,30 @@ -plugindir = $(libdir)/caja-sendto/plugins +NULL = + +AM_CPPFLAGS = \ + $(DISABLE_DEPRECATED_CPPFLAGS) \ + -DMATELOCALEDIR=\""$(datadir)/locale"\" \ + -I$(top_builddir) \ + -I$(top_srcdir)/sendto \ + $(NULL) -AM_CPPFLAGS = \ - -DDATADIR=\"$(datadir)\" \ - -DICONDIR=\"$(icondir)\" \ - -DLOCALEDIR="\"$(datadir)/locale\"" \ - -I$(top_srcdir)/sendto \ - -I$(top_builddir) \ - $(SENDTO_CFLAGS) \ - $(UPNP_CFLAGS) \ - $(DISABLE_DEPRECATED) \ - $(WARN_CFLAGS) +AM_CFLAGS = \ + $(WARN_CFLAGS) \ + $(SENDTO_CFLAGS) \ + $(NULL) + +plugindir = $(libdir)/caja-sendto/plugins plugin_LTLIBRARIES = libnstupnp.la libnstupnp_la_SOURCES = upnp.c +libnstupnp_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DDATADIR=\"$(datadir)\" \ + -DICONDIR=\"$(icondir)\" \ + $(NULL) +libnstupnp_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(UPNP_CFLAGS) \ + $(NULL) libnstupnp_la_LDFLAGS = -module -avoid-version libnstupnp_la_LIBADD = $(UPNP_LIBS) $(SENDTO_LIBS) - diff --git a/sendto/plugins/upnp/upnp.c b/sendto/plugins/upnp/upnp.c index 81a4f0a..4c09e66 100644 --- a/sendto/plugins/upnp/upnp.c +++ b/sendto/plugins/upnp/upnp.c @@ -198,7 +198,7 @@ init (NstPlugin *plugin) GtkCellRenderer *renderer; char *upload_cmd; - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); upload_cmd = g_find_program_in_path ("gupnp-upload"); -- cgit v1.2.1