diff options
| author | rbuj <[email protected]> | 2020-01-27 12:53:27 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2020-02-29 21:23:50 +0100 |
| commit | 0d372c1a0ae345d8ebbc69c52e9d55165e766109 (patch) | |
| tree | a19c197a9c087253afa045dfb603c72d6a27ffc3 /sendto/plugins/emailclient | |
| parent | a53a6e6bc6ac5092e82ae493520b1538c6ccc304 (diff) | |
| download | caja-extensions-0d372c1a0ae345d8ebbc69c52e9d55165e766109.tar.bz2 caja-extensions-0d372c1a0ae345d8ebbc69c52e9d55165e766109.tar.xz | |
automake: do not include CFLAGS in CPPFLAGS
Diffstat (limited to 'sendto/plugins/emailclient')
| -rw-r--r-- | sendto/plugins/emailclient/Makefile.am | 34 | ||||
| -rw-r--r-- | sendto/plugins/emailclient/emailclient.c | 2 |
2 files changed, 24 insertions, 12 deletions
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"); |