2007-12-27 [colin] 3.2.0cvs19
authorColin Leroy <colin@colino.net>
Thu, 27 Dec 2007 21:26:35 +0000 (21:26 +0000)
committerColin Leroy <colin@colino.net>
Thu, 27 Dec 2007 21:26:35 +0000 (21:26 +0000)
* src/plugins/pgpcore/Makefile.am
* src/plugins/pgpinline/Makefile.am
* src/plugins/pgpmime/Makefile.am
Add missing flags to build pgp plugins on maemo

ChangeLog
PATCHSETS
configure.ac
src/plugins/pgpcore/Makefile.am
src/plugins/pgpinline/Makefile.am
src/plugins/pgpmime/Makefile.am

index b7b9a7eba877aa28776253a7a61a97073a035440..74614ae53ec4f23523c563b25526621b8c3c5ab6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-27 [colin]     3.2.0cvs19
+
+       * src/plugins/pgpcore/Makefile.am
+       * src/plugins/pgpinline/Makefile.am
+       * src/plugins/pgpmime/Makefile.am
+               Add missing flags to build pgp plugins on maemo
+
 2007-12-27 [colin]     3.2.0cvs18
 
        * src/mainwindow.c
index f3021cdebbf3010620d41918f15525825a05bffb..d23594ed2d21d0af3323d921651e5d9fc1b510ca 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.43.2.69 -r 1.43.2.70 src/prefs_matcher.c;  ) > 3.2.0cvs16.patchset
 ( cvs diff -u -r 1.115.2.178 -r 1.115.2.179 src/main.c;  cvs diff -u -r 1.274.2.225 -r 1.274.2.226 src/mainwindow.c;  cvs diff -u -r 1.204.2.159 -r 1.204.2.160 src/prefs_common.c;  cvs diff -u -r 1.103.2.103 -r 1.103.2.104 src/prefs_common.h;  ) > 3.2.0cvs17.patchset
 ( cvs diff -u -r 1.274.2.226 -r 1.274.2.227 src/mainwindow.c;  ) > 3.2.0cvs18.patchset
+( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/plugins/pgpcore/Makefile.am;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpinline/Makefile.am;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/plugins/pgpmime/Makefile.am;  ) > 3.2.0cvs19.patchset
index 9a1d5e156db96af9ad1cd60b768fa1b008adc72b..7f75f503b115003dc2c9b9f5fc761f098928d366 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=18
+EXTRA_VERSION=19
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index a96c875825395aff1f225f5c1a91ed4a875cee9d..d1ae2a2887505061da4d0d5be792f2280190d787 100644 (file)
@@ -68,7 +68,8 @@ pgpcore_la_DEPENDENCIES = $(plugin_deps)
 pgpcore_la_LIBADD = $(cygwin_export_lib) $(plugin_ldadd) \
         $(GTK_LIBS) \
        $(GPGME_LIBS) \
-       $(MAEMO_LIBS)
+       $(MAEMO_LIBS) \
+       $(CONIC_LIBS)
 
 INCLUDES = \
        -I$(top_srcdir)/src \
@@ -81,6 +82,7 @@ AM_CPPFLAGS = \
        $(GTK_CFLAGS) \
        $(GPGME_CFLAGS) \
        $(MAEMO_CFLAGS) \
+       $(CONIC_CFLAGS) \
        -Wno-deprecated-declarations
 
 clean-local:
index 25c88346ed8a57b45dfb14f483db91b74f95ed94..9a9d8f6d64854425637b2756713c435f9c7e72c3 100644 (file)
@@ -66,7 +66,8 @@ pgpinline_la_LDFLAGS = \
 pgpinline_la_DEPENDENCIES = $(plugin_deps)
 pgpinline_la_LIBADD = $(plugin_ldadd) $(pgpcore_lib) $(cygwin_export_lib) \
         $(GTK_LIBS)  \
-       $(GPGME_LIBS)
+       $(GPGME_LIBS) \
+       $(CONIC_LIBS)
 
 INCLUDES = \
        -I$(top_srcdir)/src \
@@ -78,6 +79,8 @@ AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
        $(GPGME_CFLAGS) \
+       $(MAEMO_CFLAGS) \
+       $(CONIC_CFLAGS) \
        -Wno-deprecated-declarations
 
 clean-local:
index c7f3fdf35b7d0cf393caf45e9e61c70c35b77e9d..49614ef438d2f1a5b59264038641cee337b74491 100644 (file)
@@ -65,7 +65,9 @@ pgpmime_la_LDFLAGS = \
 pgpmime_la_DEPENDENCIES = $(plugin_deps)
 pgpmime_la_LIBADD = $(plugin_ldadd) $(pgpcore_lib) $(cygwin_export_lib) \
         $(GTK_LIBS) \
-       $(GPGME_LIBS)
+       $(GPGME_LIBS) \
+       $(MAEMO_LIBS) \
+       $(CONIC_LIBS)
 
 INCLUDES = \
        -I$(top_srcdir)/src \
@@ -77,6 +79,8 @@ AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
        $(GPGME_CFLAGS) \
+       $(MAEMO_CFLAGS) \
+       $(CONIC_CFLAGS) \
        -Wno-deprecated-declarations
 
 clean-local: