commit be57deacf11ed8c2b90f9c2c14a6e5440fa6cfcd
parent ebc70c9165b0825f9997400947a33dab709c1929
Author: Andrej Kacian <ticho@claws-mail.org>
Date: Fri, 13 Jul 2018 18:40:40 +0200
Do not let plugins install their header files, unless necessary.
The only plugin that needs to do that is pgpcore, as there
could in theory exist an external plugin that depends on it,
and uses symbols from it.
Diffstat:
8 files changed, 23 insertions(+), 62 deletions(-)
diff --git a/src/plugins/archive/Makefile.am b/src/plugins/archive/Makefile.am
@@ -17,11 +17,6 @@ archive_la_SOURCES = \
archiver_gtk.c \
archiver_prefs.c
-archiveincludedir = $(includedir)/claws-mail/plugins/@PACKAGE@
-archiveinclude_HEADERS = \
- archiver.h \
- archiver_prefs.h
-
archive_la_LDFLAGS = \
-avoid-version -module \
$(GTK_LIBS) \
diff --git a/src/plugins/notification/gtkhotkey/Makefile.am b/src/plugins/notification/gtkhotkey/Makefile.am
@@ -10,31 +10,18 @@ endif
AUTOMAKE_OPTIONS = subdir-objects
libcmnpgtkhotkey_la_SOURCES = \
- gtk-hotkey-info.c \
- gtk-hotkey-error.c \
- gtk-hotkey-listener.c \
- gtk-hotkey-marshal.c \
- gtk-hotkey-x11-listener.c \
- x11/tomboykeybinder.c \
- x11/eggaccelerators.c \
- gtk-hotkey-registry.c \
- gtk-hotkey-key-file-registry.c \
- gtk-hotkey-utils.c
+ gtk-hotkey-info.c gtk-hotkey-info.h \
+ gtk-hotkey-error.c gtk-hotkey-error.h \
+ gtk-hotkey-listener.c gtk-hotkey-listener.h \
+ gtk-hotkey-marshal.c gtk-hotkey-marshal.h \
+ gtk-hotkey-x11-listener.c gtk-hotkey-x11-listener.h \
+ x11/tomboykeybinder.c x11/tomboykeybinder.h \
+ x11/eggaccelerators.c x11/eggaccelerators.h \
+ gtk-hotkey-registry.c gtk-hotkey-registry.h \
+ gtk-hotkey-key-file-registry.c gtk-hotkey-key-file-registry.h \
+ gtk-hotkey-utils.c gtk-hotkey-utils.h \
+ gtkhotkey.h
-cmnpgtkhotkeyincludedir = $(includedir)/claws-mail/plugins/@PACKAGE@/gtkhotkey
-cmnpgtkhotkeyinclude_HEADERS = \
- gtk-hotkey-error.h \
- gtkhotkey.h \
- gtk-hotkey-info.h \
- gtk-hotkey-key-file-registry.h \
- gtk-hotkey-listener.h \
- gtk-hotkey-registry.h \
- gtk-hotkey-x11-listener.h \
- gtk-hotkey-marshal.h \
- x11/tomboykeybinder.h \
- x11/eggaccelerators.h \
- gtk-hotkey-utils.h
-
libcmnpgtkhotkey_la_LIBADD = \
$(GTK_LIBS) \
$(CM_NP_HOTKEY_LIBS)
diff --git a/src/plugins/pgpcore/Makefile.am b/src/plugins/pgpcore/Makefile.am
@@ -59,24 +59,21 @@ plugin_LTLIBRARIES = pgpcore.la
endif
pgpcore_la_SOURCES = \
- autocompletion.c \
- passphrase.c \
+ autocompletion.c autocompletion.h \
+ passphrase.c passphrase.h \
plugin.c \
- prefs_gpg.c \
- select-keys.c \
- sgpgme.c \
- pgp_utils.c \
- pgp_viewer.c
+ prefs_gpg.c prefs_gpg.h \
+ select-keys.c select-keys.h \
+ sgpgme.c sgpgme.h \
+ pgp_utils.c pgp_utils.h \
+ pgp_viewer.c pgp_viewer.h
pluginincludedir = $(pkgincludedir)/plugins/pgpcore
plugininclude_HEADERS = \
- autocompletion.h \
passphrase.h \
prefs_gpg.h \
- select-keys.h \
sgpgme.h \
- pgp_utils.h \
- pgp_viewer.h
+ pgp_utils.h
pgpcore_la_LDFLAGS = \
$(plugin_res_ldflag) $(no_undefined) $(export_symbols) \
diff --git a/src/plugins/pgpinline/Makefile.am b/src/plugins/pgpinline/Makefile.am
@@ -66,11 +66,7 @@ endif
pgpinline_la_SOURCES = \
plugin.c \
- pgpinline.c
-
-pluginincludedir = $(pkgincludedir)/plugins/pgpinline
-plugininclude_HEADERS = \
- pgpinline.h
+ pgpinline.c pgpinline.h
pgpinline_la_LDFLAGS = \
$(plugin_res_ldflag) $(no_undefined) $(export_symbols) \
diff --git a/src/plugins/pgpmime/Makefile.am b/src/plugins/pgpmime/Makefile.am
@@ -65,11 +65,7 @@ endif
pgpmime_la_SOURCES = \
plugin.c \
- pgpmime.c
-
-pluginincludedir = $(pkgincludedir)/plugins/pgpmime
-plugininclude_HEADERS = \
- pgpmime.h
+ pgpmime.c pgpmime.h
pgpmime_la_LDFLAGS = \
$(plugin_res_ldflag) $(no_undefined) $(export_symbols) \
diff --git a/src/plugins/smime/Makefile.am b/src/plugins/smime/Makefile.am
@@ -66,11 +66,7 @@ endif
smime_la_SOURCES = \
plugin.c \
- smime.c
-
-pluginincludedir = $(pkgincludedir)/plugins/smime
-plugininclude_HEADERS = \
- smime.h
+ smime.c smime.h
smime_la_LDFLAGS = \
$(plugin_res_ldflag) $(no_undefined) $(export_symbols) \
diff --git a/src/plugins/tnef_parse/Makefile.am b/src/plugins/tnef_parse/Makefile.am
@@ -68,9 +68,6 @@ tnef_parse_la_DEPENDENCIES = $(plugin_deps)
tnef_parse_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
$(GTK_LIBS)
-noinst_HEADERS = \
- tnef_dump.h
-
IFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
diff --git a/src/plugins/vcalendar/Makefile.am b/src/plugins/vcalendar/Makefile.am
@@ -60,6 +60,7 @@ endif
vcalendar_la_SOURCES = \
plugin.c \
+ vcal_interface.h \
vcalendar.c vcalendar.h \
vcal_manager.c vcal_manager.h \
vcal_folder.c vcal_folder.h \
@@ -69,10 +70,6 @@ vcalendar_la_SOURCES = \
common-views.c common-views.h \
day-view.c month-view.c
-vcalendarincludedir = $(includedir)/claws-mail/plugins/vcalendar
-vcalendarinclude_HEADERS = \
- vcal_interface.h
-
vcalendar_la_LDFLAGS = \
$(plugin_res_ldflag) $(no_undefined) $(export_symbols) \
-avoid-version -module \
