commit a777418b44c9c7c94dd7f5761f3d15dd2966f15d
parent 9086845194c11a9f69294c747bc091449d29cd31
Author: Colin Leroy <colin@colino.net>
Date: Wed, 20 Feb 2013 14:56:56 +0000
2013-02-20 [colin] 3.9.0cvs91
* src/plugins/fetchinfo/Makefile.am
* src/plugins/notification/Makefile.am
* src/plugins/perl/Makefile.am
* src/plugins/python/Makefile.am
Drop _plugin from the plugin's filename
Diffstat:
7 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2013-02-20 [colin] 3.9.0cvs91
+
+ * src/plugins/fetchinfo/Makefile.am
+ * src/plugins/notification/Makefile.am
+ * src/plugins/perl/Makefile.am
+ * src/plugins/python/Makefile.am
+ Drop _plugin from the plugin's filename
+
2013-02-20 [colin] 3.9.0cvs90
* configure.ac
diff --git a/PATCHSETS b/PATCHSETS
@@ -4588,3 +4588,4 @@
( cvs diff -u -r 1.654.2.4664 -r 1.654.2.4665 configure.ac; cvs diff -u -r 1.24.2.31 -r 1.24.2.32 Makefile.am; ) > 3.9.0cvs88.patchset
( cvs diff -u -r 1.654.2.4665 -r 1.654.2.4666 configure.ac; ) > 3.9.0cvs89.patchset
( cvs diff -u -r 1.654.2.4666 -r 1.654.2.4667 configure.ac; ) > 3.9.0cvs90.patchset
+( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/fetchinfo/Makefile.am; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/notification/Makefile.am; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/perl/Makefile.am; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/python/Makefile.am; ) > 3.9.0cvs91.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=90
+EXTRA_VERSION=91
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/plugins/fetchinfo/Makefile.am b/src/plugins/fetchinfo/Makefile.am
@@ -1,14 +1,14 @@
plugindir = $(pkglibdir)/plugins
if BUILD_FETCHINFO_PLUGIN
-plugin_LTLIBRARIES = fetchinfo_plugin.la
+plugin_LTLIBRARIES = fetchinfo.la
endif
-fetchinfo_plugin_la_SOURCES = \
+fetchinfo_la_SOURCES = \
fetchinfo_plugin.c fetchinfo_plugin.h \
fetchinfo_plugin_gtk.c
-fetchinfo_plugin_la_LDFLAGS = \
+fetchinfo_la_LDFLAGS = \
-avoid-version -module \
$(GTK_LIBS)
diff --git a/src/plugins/notification/Makefile.am b/src/plugins/notification/Makefile.am
@@ -54,10 +54,10 @@ endif
plugindir = $(pkglibdir)/plugins
if BUILD_NOTIFICATION_PLUGIN
-plugin_LTLIBRARIES = notification_plugin.la
+plugin_LTLIBRARIES = notification.la
endif
-notification_plugin_la_SOURCES = \
+notification_la_SOURCES = \
notification_plugin.c notification_plugin.h \
notification_core.c notification_core.h \
notification_popup.c notification_popup.h \
@@ -72,11 +72,11 @@ notification_plugin_la_SOURCES = \
notification_pixbuf.c notification_pixbuf.h \
raw_claws_mail_logo_64x64.h
-notification_plugin_la_LDFLAGS = \
+notification_la_LDFLAGS = \
$(plugin_res_ldflag) $(no_undefined) $(export_symbols) \
-avoid-version -module
-notification_plugin_la_DEPENDENCIES = $(plugin_deps) \
+notification_la_DEPENDENCIES = $(plugin_deps) \
$(hotkey_lib_path)
INCLUDES = \
@@ -87,14 +87,14 @@ INCLUDES = \
-I$(top_srcdir)/src/gtk
-notification_plugin_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
+notification_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
$(GTK_LIBS) \
$(libnotify_LIBS) \
$(libindicate_LIBS) \
$(libcanberra_gtk_LIBS) \
$(hotkey_lib_path)
-notification_plugin_la_CPPFLAGS = \
+notification_la_CPPFLAGS = \
$(NOTIFY_CFLAGS) \
$(CLAWS_MAIL_CFLAGS) \
$(GLIB_CFLAGS) \
diff --git a/src/plugins/perl/Makefile.am b/src/plugins/perl/Makefile.am
@@ -1,17 +1,17 @@
plugindir = $(pkglibdir)/plugins
if BUILD_PERL_PLUGIN
-plugin_LTLIBRARIES = perl_plugin.la
+plugin_LTLIBRARIES = perl.la
endif
-perl_plugin_la_SOURCES = \
+perl_la_SOURCES = \
perl_plugin.c perl_plugin.h \
perl_gtk.c perl_gtk.h
-perl_plugin_la_LDFLAGS = \
+perl_la_LDFLAGS = \
-avoid-version -module
-perl_plugin_la_LIBADD = \
+perl_la_LIBADD = \
$(PERL_LDFLAGS) \
$(GTK_LIBS)
diff --git a/src/plugins/python/Makefile.am b/src/plugins/python/Makefile.am
@@ -1,10 +1,10 @@
plugindir = $(pkglibdir)/plugins
if BUILD_PYTHON_PLUGIN
-plugin_LTLIBRARIES = python_plugin.la
+plugin_LTLIBRARIES = python.la
endif
-python_plugin_la_SOURCES = \
+python_la_SOURCES = \
clawsmailmodule.c \
clawsmailmodule.h \
composewindowtype.c \
@@ -21,7 +21,7 @@ python_plugin_la_SOURCES = \
python-shell.c \
python-shell.h
-python_plugin_la_LDFLAGS = \
+python_la_LDFLAGS = \
-avoid-version -module \
$(GLIB_LIBS) \
$(GTK_LIBS) \