[Commits] ChangeLog 1.37 1.38 PATCHSETS 1.37 1.38 claws-contacts.pc.in 1.1 1.2 configure.ac 1.38 1.39
miras at claws-mail.org
miras at claws-mail.org
Sat Dec 10 00:01:22 CET 2011
Update of /home/claws-mail/contacts
In directory claws-mail:/tmp/cvs-serv2085
Modified Files:
ChangeLog PATCHSETS claws-contacts.pc.in configure.ac
Log Message:
2011-12-09 [mir] 0.6.0cvs38
* claws-contacts.pc.in
* configure.ac
* extensions/Makefile.am
* extensions/example/Makefile.am
* extensions/example/configure.ac
* extensions/example/config/Makefile.am
* extensions/example/src/Makefile.am
* extensions/example/src/example-extension.c
* extensions/export/ldifexport_extension.c
* plugins/Makefile.am
* plugins/example/Makefile.am
* plugins/example/configure.ac
* src/Makefile.am
* src/callbacks.c
* src/contactwindow.c
* src/extension-loader.c
* src/extension-loader.h
* src/extension.c
* src/extension.h
* src/gtk-utils.c
* src/mainwindow.c
* src/mainwindow.h
Fix a number of bugs
Refined the build system
Added a plugable extension framework
Index: configure.ac
===================================================================
RCS file: /home/claws-mail/contacts/configure.ac,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- configure.ac 3 Dec 2011 21:25:23 -0000 1.38
+++ configure.ac 9 Dec 2011 23:01:20 -0000 1.39
@@ -11,7 +11,7 @@
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=37
+EXTRA_VERSION=38
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
@@ -43,22 +43,27 @@
AC_DEFINE_UNQUOTED(BINDIR, "$BINDIR", [Where is binary installed])
AC_DEFINE_UNQUOTED(PIXDIR, "${ac_pwd}/pixmaps", [Directory with various pixmaps])
PLUGINDIR="${ac_pwd}/plugins"
- EXTENSIONDIR="${ac_pwd}/extensions"
- AC_DEFINE_UNQUOTED(EXTENSIONDIR, "$EXTENSIONDIR", [Where is extensions located])
+ CLAWS_CONTACTS_EXTENSIONDIR="${ac_pwd}/extensions"
+ AC_DEFINE_UNQUOTED(CLAWS_CONTACTS_EXTENSIONDIR, "$CLAWS_CONTACTS_EXTENSIONDIR", [Where is extensions located])
+ AC_DEFINE_UNQUOTED(EXTENSIONSUBDIR, 1, [is extensions located in subdirs])
else
if test "x$prefix" = "xNONE"; then
prefix=$ac_default_prefix
fi
- CFLAGS="-g -Wall -O -O2 -Wno-unused-variable -Wno-unused-variable"
+ CFLAGS="-g -Wall -O -O2 -Wno-unused-variable -Wno-uninitialized"
BINDIR="${prefix}/bin"
AC_DEFINE_UNQUOTED(BINDIR, "$BINDIR", [Where is binary installed])
AC_DEFINE_UNQUOTED(PIXDIR, "${prefix}/share/claws-contacts/pixmaps", [Directory with various pixmaps])
PLUGINDIR="${prefix}/lib/claws-contacts/plugins"
- EXTENSIONDIR="${prefix}/lib/claws-contacts/extensions"
- AC_DEFINE_UNQUOTED(EXTENSIONDIR, "$EXTENSIONDIR", [Where is extensions located])
+ CLAWS_CONTACTS_EXTENSIONDIR="${prefix}/lib/claws-contacts/extensions"
+ AC_DEFINE_UNQUOTED(CLAWS_CONTACTS_EXTENSIONDIR, "$CLAWS_CONTACTS_EXTENSIONDIR", [Where is extensions located])
+ AC_DEFINE_UNQUOTED(EXTENSIONSUBDIR, 0, [is extensions located in subdirs])
fi
+CLAWS_CONTACTS_CFLAGS="-I${ac_pwd}/src -I${ac_pwd}/src/dbus"
+
+AC_SUBST(CLAWS_CONTACTS_CFLAGS)
AC_SUBST(PLUGINDIR)
-AC_SUBST(EXTENSIONDIR)
+AC_SUBST(CLAWS_CONTACTS_EXTENSIONDIR)
AC_SUBST(BINDIR)
GLIB_REQUIRED=2.16.0
@@ -259,16 +264,19 @@
claws-contacts.desktop
pixmaps/Makefile
src/Makefile
- src/dbus/Makefile
- dbus-client/Makefile
- xmllib/Makefile
- extensions/Makefile
- extensions/export/Makefile
- extensions/import/Makefile
+ src/dbus/Makefile
+ dbus-client/Makefile
+ xmllib/Makefile
+ extensions/Makefile
+ extensions/export/Makefile
+ extensions/import/Makefile
+ extensions/example/Makefile
+ extensions/example/src/Makefile
plugins/Makefile
- plugins/example/Makefile
plugins/xml/Makefile
plugins/ldap/Makefile
+ plugins/example/Makefile
+ plugins/example/src/Makefile
])
AC_OUTPUT
@@ -283,6 +291,7 @@
Extension dir:\t${EXTENSIONDIR}
Plugins:\t${PLUGINS}
Plugin dir:\t${PLUGINDIR}
+ Extension dir:\t${CLAWS_CONTACTS_EXTENSIONDIR}
Debug mode:\t${DEBUG_MODE}
DBus client:\t${ac_cv_enable_dbus_client}
Index: PATCHSETS
===================================================================
RCS file: /home/claws-mail/contacts/PATCHSETS,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- PATCHSETS 3 Dec 2011 21:25:23 -0000 1.37
+++ PATCHSETS 9 Dec 2011 23:01:20 -0000 1.38
@@ -35,3 +35,4 @@
( cvs diff -u -r 1.2 -r 1.3 commitHelper; ) > 0.6.0cvs35.patchset
( diff -u /dev/null plugins/example/AUTHORS; diff -u /dev/null plugins/example/ChangeLog; cvs diff -u -r 1.1 -r 1.2 plugins/example/Makefile.am; diff -u /dev/null plugins/example/NEWS; diff -u /dev/null plugins/example/README; diff -u /dev/null plugins/example/TODO; diff -u /dev/null plugins/example/configure.ac; cvs diff -u -r -1.6 -r -1.7 plugins/example/example-plugin.c; diff -u /dev/null plugins/example/src/Makefile.am; diff -u /dev/null plugins/example/src/example-plugin.c; cvs diff -u -r 1.1 -r 1.2 extensions/Makefile.am; diff -u /dev/null extensions/example/AUTHORS; diff -u /dev/null extensions/example/ChangeLog; diff -u /dev/null extensions/example/Makefile.am; diff -u /dev/null extensions/example/NEWS; diff -u /dev/null extensions/example/README; diff -u /dev/null extensions/example/TODO; diff -u /dev/null extensions/example/configure.ac; diff -u /dev/null extensions/example/config/Makefile.am; diff -u /dev/null extensions/example/src/Makefile.am; diff -u /dev/null extensions/example/src/example-extension.c; cvs diff -u -r 1.1 -r 1.2 extensions/export/Makefile.am; cvs diff -u -r 1.1 -r 1.2 extensions/export/ldifexport_extension.c; cvs diff -u -r 1.1 -r 1.2 extensions/import/Makefile.am; ) > 0.6.0cvs36.patchset
( cvs diff -u -r 1.1 -r 1.2 plugins/example/.cvsignore; diff -u /dev/null plugins/example/src/.cvsignore; cvs diff -u -r 1.1 -r 1.2 extensions/.cvsignore; diff -u /dev/null extensions/example/.cvsignore; diff -u /dev/null extensions/example/config/.cvsignore; diff -u /dev/null extensions/example/src/.cvsignore; ) > 0.6.0cvs37.patchset
+( cvs diff -u -r 1.1 -r 1.2 claws-contacts.pc.in; cvs diff -u -r 1.38 -r 1.39 configure.ac; cvs diff -u -r 1.2 -r 1.3 extensions/Makefile.am; cvs diff -u -r 1.1 -r 1.2 extensions/example/Makefile.am; cvs diff -u -r 1.1 -r 1.2 extensions/example/configure.ac; cvs diff -u -r -1.1 -r -1.2 extensions/example/config/Makefile.am; cvs diff -u -r 1.1 -r 1.2 extensions/example/src/Makefile.am; cvs diff -u -r 1.1 -r 1.2 extensions/example/src/example-extension.c; cvs diff -u -r 1.2 -r 1.3 extensions/export/ldifexport_extension.c; cvs diff -u -r 1.2 -r 1.3 plugins/Makefile.am; cvs diff -u -r 1.2 -r 1.3 plugins/example/Makefile.am; cvs diff -u -r 1.1 -r 1.2 plugins/example/configure.ac; cvs diff -u -r 1.3 -r 1.4 src/Makefile.am; cvs diff -u -r 1.13 -r 1.14 src/callbacks.c; cvs diff -u -r 1.11 -r 1.12 src/contactwindow.c; cvs diff -u -r 1.1 -r 1.2 src/extension-loader.c; cvs diff -u -r 1.1 -r 1.2 src/extension-loader.h; cvs diff -u -r -1.1 -r -1.2 src/extension.c; cvs diff -u -r 1.1 -r 1.2 src/extension.h; cvs diff -u -r 1.4 -r 1.5 src/gtk-utils.c; cvs diff -u -r 1.5 -r 1.6 src/mainwindow.c; cvs diff -u -r 1.3 -r 1.4 src/mainwindow.h; ) > 0.6.0cvs38.patchset
Index: claws-contacts.pc.in
===================================================================
RCS file: /home/claws-mail/contacts/claws-contacts.pc.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- claws-contacts.pc.in 7 Sep 2011 17:35:28 -0000 1.1
+++ claws-contacts.pc.in 9 Dec 2011 23:01:20 -0000 1.2
@@ -6,6 +6,7 @@
pkglibdir=${libdir}/@PACKAGE@
pkgincludedir=${includedir}/@PACKAGE@
plugindir=${pkglibdir}/plugins
+extensiondir=${pkglibdir}/extensions
Name: Claws Contacts
Description: Claws Contacts; an address book for Claws Mail
Index: ChangeLog
===================================================================
RCS file: /home/claws-mail/contacts/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- ChangeLog 3 Dec 2011 21:25:23 -0000 1.37
+++ ChangeLog 9 Dec 2011 23:01:20 -0000 1.38
@@ -1,3 +1,32 @@
+2011-12-09 [mir] 0.6.0cvs38
+
+ * claws-contacts.pc.in
+ * configure.ac
+ * extensions/Makefile.am
+ * extensions/example/Makefile.am
+ * extensions/example/configure.ac
+ * extensions/example/config/Makefile.am
+ * extensions/example/src/Makefile.am
+ * extensions/example/src/example-extension.c
+ * extensions/export/ldifexport_extension.c
+ * plugins/Makefile.am
+ * plugins/example/Makefile.am
+ * plugins/example/configure.ac
+ * src/Makefile.am
+ * src/callbacks.c
+ * src/contactwindow.c
+ * src/extension-loader.c
+ * src/extension-loader.h
+ * src/extension.c
+ * src/extension.h
+ * src/gtk-utils.c
+ * src/mainwindow.c
+ * src/mainwindow.h
+ Fix a number of bugs
+ Refined the build system
+ Added a plugable extension framework
+
+
2011-12-03 [mir] 0.6.0cvs37
* plugins/example/.cvsignore
More information about the Commits
mailing list