summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac3
-rw-r--r--gksu/Makefile.am26
-rw-r--r--image-converter/Makefile.am43
-rw-r--r--open-terminal/Makefile.am43
-rw-r--r--sendto/Makefile.am19
-rw-r--r--sendto/caja-sendto-command.c2
-rw-r--r--sendto/caja-sendto-module.c2
-rw-r--r--sendto/plugins/caja-burn/Makefile.am35
-rw-r--r--sendto/plugins/caja-burn/caja-burn.c2
-rw-r--r--sendto/plugins/emailclient/Makefile.am34
-rw-r--r--sendto/plugins/emailclient/emailclient.c2
-rw-r--r--sendto/plugins/gajim/Makefile.am34
-rw-r--r--sendto/plugins/gajim/gajim.c2
-rw-r--r--sendto/plugins/pidgin/Makefile.am42
-rw-r--r--sendto/plugins/pidgin/pidgin.c2
-rw-r--r--sendto/plugins/removable-devices/Makefile.am35
-rw-r--r--sendto/plugins/removable-devices/removable-devices.c2
-rw-r--r--sendto/plugins/upnp/Makefile.am35
-rw-r--r--sendto/plugins/upnp/upnp.c2
-rw-r--r--share/Makefile.am49
-rw-r--r--wallpaper/Makefile.am30
-rw-r--r--xattr-tags/Makefile.am28
22 files changed, 323 insertions, 149 deletions
diff --git a/configure.ac b/configure.ac
index 1fdc2a7..40a8676 100644
--- a/configure.ac
+++ b/configure.ac
@@ -331,6 +331,9 @@ GETTEXT_PACKAGE=caja-extensions
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package])
+DISABLE_DEPRECATED_CPPFLAGS="-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
+AC_SUBST(DISABLE_DEPRECATED_CPPFLAGS)
+
AC_OUTPUT([
Makefile
sendto/org.mate.Caja.Sendto.gschema.xml
diff --git a/gksu/Makefile.am b/gksu/Makefile.am
index 0ace449..93431c8 100644
--- a/gksu/Makefile.am
+++ b/gksu/Makefile.am
@@ -1,9 +1,29 @@
-AM_CFLAGS = -g -O2 -Wall
-AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" $(CAJA_CFLAGS)
+NULL =
+
+AM_CPPFLAGS = \
+ $(DISABLE_DEPRECATED_CPPFLAGS) \
+ -DMATELOCALEDIR=\""$(datadir)/locale"\" \
+ -I$(top_builddir) \
+ $(NULL)
+
+AM_CFLAGS = \
+ $(WARN_CFLAGS) \
+ $(NULL)
+
+caja_extensiondir = $(libdir)/caja/extensions-2.0
-caja_extensiondir=$(libdir)/caja/extensions-2.0
caja_extension_LTLIBRARIES = libcaja-gksu.la
+
libcaja_gksu_la_SOURCES = libcaja-gksu.c
+libcaja_gksu_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -DDATA_DIR=\"$(datadir)\" \
+ -DPREFIX=\"$(prefix)\" \
+ $(NULL)
+libcaja_gksu_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(CAJA_CFLAGS) \
+ $(NULL)
libcaja_gksu_la_LDFLAGS = -module -avoid-version -no-undefined
libcaja_gksu_la_LIBADD = $(CAJA_LIBS)
diff --git a/image-converter/Makefile.am b/image-converter/Makefile.am
index 1e56060..0b8154f 100644
--- a/image-converter/Makefile.am
+++ b/image-converter/Makefile.am
@@ -1,26 +1,43 @@
+NULL =
AM_CPPFLAGS = \
- -DG_LOG_DOMAIN=\"Caja-Image-Converter\" \
+ $(DISABLE_DEPRECATED_CPPFLAGS) \
-DDATADIR=\"$(datadir)\" \
- -DMATELOCALEDIR=\""$(datadir)/locale"\" \
+ -DMATELOCALEDIR=\""$(datadir)/locale"\" \
-I$(top_srcdir) \
-I$(top_builddir) \
- $(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS) \
- $(CAJA_CFLAGS) \
- $(IMAGE_CONVERTER_CFLAGS)
+ $(NULL)
+
+AM_CFLAGS = \
+ $(WARN_CFLAGS) \
+ $(NULL)
caja_extensiondir=$(CAJA_EXTENSION_DIR)
caja_extension_LTLIBRARIES=libcaja-image-converter.la
-libcaja_image_converter_la_SOURCES = \
- image-converter.c \
- caja-image-converter.c caja-image-converter.h \
- caja-image-resizer.c caja-image-resizer.h \
- caja-image-rotator.c caja-image-rotator.h
-
+libcaja_image_converter_la_SOURCES = \
+ image-converter.c \
+ caja-image-converter.c \
+ caja-image-converter.h \
+ caja-image-resizer.c \
+ caja-image-resizer.h \
+ caja-image-rotator.c \
+ caja-image-rotator.h \
+ $(NULL)
+libcaja_image_converter_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -DG_LOG_DOMAIN=\"Caja-Image-Converter\" \
+ $(NULL)
+libcaja_image_converter_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(CAJA_CFLAGS) \
+ $(IMAGE_CONVERTER_CFLAGS) \
+ $(NULL)
libcaja_image_converter_la_LDFLAGS = -module -avoid-version
-libcaja_image_converter_la_LIBADD = $(CAJA_LIBS) $(IMAGE_CONVERTER_LIBS)
+libcaja_image_converter_la_LIBADD = \
+ $(CAJA_LIBS) \
+ $(IMAGE_CONVERTER_LIBS) \
+ $(NULL)
builderdir = $(datadir)/caja-extensions
builder_DATA = \
diff --git a/open-terminal/Makefile.am b/open-terminal/Makefile.am
index ea3e070..f1c77fb 100644
--- a/open-terminal/Makefile.am
+++ b/open-terminal/Makefile.am
@@ -1,23 +1,34 @@
-AM_CPPFLAGS = \
- -DG_LOG_DOMAIN=\"Caja-Open-Terminal\" \
- -DDATADIR=\"$(datadir)\" \
- -DMATELOCALEDIR=\""$(datadir)/locale"\" \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- $(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS) \
- $(CAJA_CFLAGS) \
- $(OPENTERMINAL_CFLAGS)
+NULL =
+
+AM_CPPFLAGS = \
+ $(DISABLE_DEPRECATED_CPPFLAGS) \
+ -DMATELOCALEDIR=\""$(datadir)/locale"\" \
+ -I$(top_builddir) \
+ $(NULL)
-caja_extensiondir=$(CAJA_EXTENSION_DIR)
+AM_CFLAGS = \
+ $(WARN_CFLAGS) \
+ $(NULL)
-caja_extension_LTLIBRARIES=libcaja-open-terminal.la
+caja_extensiondir = $(CAJA_EXTENSION_DIR)
-libcaja_open_terminal_la_SOURCES = \
- caja-open-terminal.c \
- caja-open-terminal.h \
- open-terminal.c
+caja_extension_LTLIBRARIES = libcaja-open-terminal.la
+libcaja_open_terminal_la_SOURCES = \
+ caja-open-terminal.c \
+ caja-open-terminal.h \
+ open-terminal.c \
+ $(NULL)
+libcaja_open_terminal_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -DG_LOG_DOMAIN=\"Caja-Open-Terminal\" \
+ -DDATADIR=\"$(datadir)\" \
+ $(NULL)
+libcaja_open_terminal_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(CAJA_CFLAGS) \
+ $(OPENTERMINAL_CFLAGS) \
+ $(NULL)
libcaja_open_terminal_la_LDFLAGS = -module -avoid-version
libcaja_open_terminal_la_LIBADD = $(CAJA_LIBS) $(OPENTERMINAL_LIBS)
diff --git a/sendto/Makefile.am b/sendto/Makefile.am
index df02252..e23cde8 100644
--- a/sendto/Makefile.am
+++ b/sendto/Makefile.am
@@ -1,17 +1,20 @@
-NULL=
-
+NULL =
SUBDIRS = . docs plugins
AM_CPPFLAGS = \
+ $(DISABLE_DEPRECATED_CPPFLAGS) \
-DDATADIR=\"$(datadir)\" \
-DPLUGINDIR=\"$(libdir)/caja-sendto/plugins\" \
+ -DMATELOCALEDIR="\"$(datadir)/locale\"" \
-I$(top_srcdir) \
-I$(top_builddir) \
- -DLOCALEDIR="\"$(datadir)/locale\"" \
- $(SENDTO_CFLAGS) \
- $(CAJA_CFLAGS) \
- $(DISABLE_DEPRECATED) \
- $(WARN_CFLAGS)
+ $(NULL)
+
+AM_CFLAGS = \
+ $(WARN_CFLAGS) \
+ $(SENDTO_CFLAGS) \
+ $(CAJA_CFLAGS) \
+ $(NULL)
caja_sendto_includedir = $(includedir)/caja-sendto/
caja_sendto_include_HEADERS = caja-sendto-plugin.h
@@ -21,7 +24,7 @@ pkgconfig_DATA = caja-sendto.pc
noinst_LTLIBRARIES = libnstplugin.la
libnstplugin_la_SOURCES = \
- caja-sendto-plugin.h \
+ caja-sendto-plugin.h \
nst-enum-types.c \
nst-enum-types.h
libnstplugin_la_LIBADD = $(SENDTO_LIBS)
diff --git a/sendto/caja-sendto-command.c b/sendto/caja-sendto-command.c
index 1b0d7da..1ede360 100644
--- a/sendto/caja-sendto-command.c
+++ b/sendto/caja-sendto-command.c
@@ -790,7 +790,7 @@ int main (int argc, char **argv)
GOptionContext *context;
GError *error = NULL;
- bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
diff --git a/sendto/caja-sendto-module.c b/sendto/caja-sendto-module.c
index b01377c..cfb4737 100644
--- a/sendto/caja-sendto-module.c
+++ b/sendto/caja-sendto-module.c
@@ -33,7 +33,7 @@ caja_module_initialize (GTypeModule*module)
{
caja_nste_register_type (module);
- bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
}
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");
diff --git a/share/Makefile.am b/share/Makefile.am
index b81d0f2..8a257f3 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,28 +1,39 @@
+NULL =
+
interfacesdir = $(datadir)/caja-extensions
interfaces_DATA = share-dialog.ui
-libcaja_share_la_CFLAGS = \
- -Wall \
- -DG_LOG_DOMAIN=\"Caja-Share\" \
- -DINTERFACES_DIR=\"$(interfacesdir)\" \
- -DDATADIR=\"$(datadir)\" \
- -DMATELOCALEDIR=\""$(datadir)/locale"\" \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- $(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS) \
- $(CAJA_CFLAGS) \
- $(SHARE_CFLAGS)
+AM_CPPFLAGS = \
+ $(DISABLE_DEPRECATED_CPPFLAGS) \
+ -DMATELOCALEDIR=\""$(datadir)/locale"\" \
+ -I$(top_builddir) \
+ $(NULL)
-caja_extensiondir=$(CAJA_EXTENSION_DIR)
-caja_extension_LTLIBRARIES=libcaja-share.la
+AM_CFLAGS = \
+ $(WARN_CFLAGS) \
+ $(NULL)
-libcaja_share_la_SOURCES = \
- caja-share.c \
- caja-share.h \
- shares.c \
- shares.h
+caja_extensiondir = $(CAJA_EXTENSION_DIR)
+caja_extension_LTLIBRARIES = libcaja-share.la
+
+libcaja_share_la_SOURCES = \
+ caja-share.c \
+ caja-share.h \
+ shares.c \
+ shares.h \
+ $(NULL)
+libcaja_share_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -DG_LOG_DOMAIN=\"Caja-Share\" \
+ -DINTERFACES_DIR=\"$(interfacesdir)\" \
+ -DDATADIR=\"$(datadir)\" \
+ $(NULL)
+libcaja_share_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(CAJA_CFLAGS) \
+ $(SHARE_CFLAGS) \
+ $(NULL)
libcaja_share_la_LDFLAGS = -module -avoid-version
libcaja_share_la_LIBADD = $(SHARE_LIBS) $(CAJA_LIBS)
diff --git a/wallpaper/Makefile.am b/wallpaper/Makefile.am
index 9b1dfb2..5bb905e 100644
--- a/wallpaper/Makefile.am
+++ b/wallpaper/Makefile.am
@@ -1,13 +1,31 @@
-AM_CPPFLAGS = $(CAJA_CFLAGS)
+NULL =
+
+AM_CPPFLAGS = \
+ $(DISABLE_DEPRECATED_CPPFLAGS) \
+ -DMATELOCALEDIR=\""$(datadir)/locale"\" \
+ -I$(top_builddir) \
+ $(NULL)
+
+AM_CFLAGS = \
+ $(WARN_CFLAGS) \
+ $(NULL)
caja_extensiondir = $(CAJA_EXTENSION_DIR)
-caja_extension_LTLIBRARIES = libcaja-wallpaper.la
-libcaja_wallpaper_la_SOURCES = \
- caja-wallpaper-extension.c\
- caja-wallpaper-extension.h\
- caja-wallpaper-command.c
+caja_extension_LTLIBRARIES = libcaja-wallpaper.la
+libcaja_wallpaper_la_SOURCES = \
+ caja-wallpaper-extension.c \
+ caja-wallpaper-extension.h \
+ caja-wallpaper-command.c \
+ $(NULL)
+libcaja_wallpaper_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ $(NULL)
+libcaja_wallpaper_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(CAJA_CFLAGS) \
+ $(NULL)
libcaja_wallpaper_la_LDFLAGS = -module -avoid-version
libcaja_wallpaper_la_LIBADD = $(CAJA_LIBS)
diff --git a/xattr-tags/Makefile.am b/xattr-tags/Makefile.am
index 3069d07..27cd567 100644
--- a/xattr-tags/Makefile.am
+++ b/xattr-tags/Makefile.am
@@ -1,11 +1,31 @@
-AM_CPPFLAGS = $(CAJA_CFLAGS)
+NULL =
+
+AM_CPPFLAGS = \
+ $(DISABLE_DEPRECATED_CPPFLAGS) \
+ -DMATELOCALEDIR=\""$(datadir)/locale"\" \
+ -I$(top_builddir) \
+ $(NULL)
+
+AM_CFLAGS = \
+ $(WARN_CFLAGS) \
+ $(NULL)
caja_extensiondir = $(CAJA_EXTENSION_DIR)
+
caja_extension_LTLIBRARIES = libcaja-xattr-tags.la
-libcaja_xattr_tags_la_SOURCES = \
- caja-xattr-tags-extension.c \
- caja-xattr-tags-extension.h
+libcaja_xattr_tags_la_SOURCES = \
+ caja-xattr-tags-extension.c \
+ caja-xattr-tags-extension.h \
+ $(NULL)
+libcaja_xattr_tags_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -I$(top_srcdir) \
+ $(NULL)
+libcaja_xattr_tags_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(CAJA_CFLAGS) \
+ $(NULL)
libcaja_xattr_tags_la_LDFLAGS = -module -avoid-version
libcaja_xattr_tags_la_LIBADD = $(CAJA_LIBS)
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-22 07:47:28 +0000