Changeset 251

Timestamp:

05/10/06 11:42:40

Author:

pvanhoof

Message:

Added libtinymail-gnome-desktop

Files:

• trunk/Makefile.am (modified) (1 diff)
• trunk/configure.ac (modified) (3 diffs)
• trunk/libtinymail-camel/Makefile.am (modified) (2 diffs)
• trunk/libtinymail-gnome-desktop (added)
• trunk/libtinymail-gnome-desktop/Makefile.am (added)
• trunk/libtinymail-gnome-desktop/libtinymail-gnome-desktop.pc.in (added)
• trunk/libtinymail-gnome-desktop/tny-account-store.c (moved) (moved from trunk/tinymail/tny-account-store.c)
• trunk/libtinymail-gnome-desktop/tny-account-store.h (moved) (moved from trunk/tinymail/tny-account-store.h)
• trunk/libtinymail-gnome-desktop/tny-device.c (added)
• trunk/libtinymail-gnome-desktop/tny-device.h (added)
• trunk/tinymail/Makefile.am (modified) (3 diffs)

trunk/Makefile.am

@@ -1 @@
--camel libtinymailui libtinymail-gnomevfs libtinymailui-gtk
+ui libtinymail-gnomevfs libtinymailui-gtk $(PLATFORMDIR) libtinymail-camel
-if BUILD_UNITTESTS
-SUBDIRS .= libtinymail-test 

trunk/configure.ac

@@ -45 +45 @@
-AM_CONDITIONAL(BUILD_UNITTESTS, test x$build_unittests = xtrue)
-
+AC_ARG_WITH(platform,
+[  --with-platform=gnome-desktop       platform to compile [gnome-desktop]],
+[case "${with_platform}" in
+  gnome-desktop) PLATFORMDIR=libtinymail-gnome-desktop ;;
+  *) AC_MSG_ERROR(bad value ${with_platform} for --with-platform) ;;
+esac],[PLATFORMDIR=libtinymail-gnome-desktop])
+
+AC_SUBST(PLATFORMDIR)
+
-GTK_DOC_CHECK([1.0])
-
@@ -64 +73 @@
-
-dnl gnomeui-2 is for gnome_icon_lookup :-\
+dnl Maybe refactor it as a thiny in libtinymail-gnome-desktop?
+
-PKG_CHECK_MODULES(LIBTINYMAILUI_GTK, glib-2.0 >= 2.8 gobject-2.0 libgnomeui-2.0 gtk+-2.0)
-AC_SUBST(LIBTINYMAILUI_GTK_CFLAGS)
-AC_SUBST(LIBTINYMAILUI_GTK_LIBS)
+
+if test x$PLATFORMDIR = xlibtinymail-gnome-desktop; then
+PKG_CHECK_MODULES(LIBTINYMAIL_GNOME_DESKTOP, glib-2.0 >= 2.8 gobject-2.0 libgnomeui-2.0 gtk+-2.0)
+else
+LIBTINYMAIL_GNOME_DESKTOP_CFLAGS=
+LIBTINYMAIL_GNOME_DESKTOP_LIBS=
+fi
+AC_SUBST(LIBTINYMAIL_GNOME_DESKTOP_CFLAGS)
+AC_SUBST(LIBTINYMAIL_GNOME_DESKTOP_LIBS)
-
-if test x$build_unittests = xtrue; then
@@ -121 +141 @@
-libtinymail-gnomevfs/Makefile
-libtinymail-gnomevfs/libtinymail-gnomevfs.pc
+libtinymail-gnome-desktop/Makefile
+libtinymail-gnome-desktop/libtinymail-gnome-desktop.pc
-libtinymail-test/Makefile
-tinymail/Makefile

trunk/libtinymail-camel/Makefile.am

@@ -1 +1 @@
-INCLUDES = $(LIBTINYMAIL_CAMEL_CFLAGS) -I.      \
-
+
+
-
-# This makes tinymail faster, but wastes more memory
@@ -44 +45 @@
-libtinymail_camel_1_0_la_LIBADD =               \
-        $(LIBTINYMAIL_CAMEL_LIBS)               \
-
+
+
-
-libtinymail_camel_1_0includedir = $(includedir)/libtinymail-camel-$(API_VERSION)

trunk/tinymail/Makefile.am

@@ -4 +4 @@
-        -I$(top_builddir)/libtinymailui                                 \
-        -I$(top_builddir)/libtinymailui-gtk                             \
-
+
+
-        -DASYNC_HEADERS
-
@@ -11 +12 @@
-tinymail_SOURCES =                                                      \
-        tny-main.c                                                      \
-        tny-account-store.c                                             \
-        tny-summary-window.c                                            \
-        tny-summary-window.h                                            \
-        tny-account-store.h                                             \
-        tny-password-dialog.h                                           \
-        tny-password-dialog.c
@@ -23 +22 @@
-        $(top_builddir)/libtinymailui/libtinymailui-$(API_VERSION).la           \
-        $(top_builddir)/libtinymailui-gtk/libtinymailui-gtk-$(API_VERSION).la   \
-
+
+