Changeset 3187
- Timestamp:
- 12/23/07 17:37:08
- Files:
-
- trunk/ChangeLog (modified) (1 diff)
- trunk/Makefile.am (modified) (1 diff)
- trunk/configure.ac (modified) (5 diffs)
- trunk/docs/devel/reference/Makefile.am (modified) (5 diffs)
- trunk/docs/devel/reference/libtinymail-docs.sgml (modified) (2 diffs)
- trunk/libtinymail-asyncworker (deleted)
- trunk/libtinymail-queues (deleted)
- trunk/tests/c-demo/Makefile.am (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/ChangeLog
r3177 r3187 1 2007-12-22 Philip Van Hoof <pvanhoof@gnome.org> 2 3 * Removed libtinymail-queues and libtinymail-asyncworker since those 4 two libs are not going to be supported in Tinymail 1.0 5 * Improvements to the NAMESPACE, LIST and LSUB things 6 1 7 2007-12-22 Philip Van Hoof <pvanhoof@gnome.org> 2 8 trunk/Makefile.am
r2573 r3187 35 35 endif 36 36 37 if BUILD_QUEUES38 SUBDIRS += libtinymail-queues39 endif40 41 if BUILD_ASYNCWORKER42 SUBDIRS += libtinymail-asyncworker43 endif44 37 45 38 SUBDIRS += tests bindings po trunk/configure.ac
r3092 r3187 58 58 59 59 dnl ### default values (will get overwritten) 60 build_queues=false61 build_asyncworker=false62 60 build_acap=false 63 61 build_gnome=true … … 214 212 AM_CONDITIONAL(BUILD_ACAP, test x$build_acap = xtrue) 215 213 216 dnl ### Enable queues ##217 AC_ARG_ENABLE(queues,218 AC_HELP_STRING([--enable-queues],219 [Build using queues]),220 [case "${enableval}" in221 yes) build_queues=true ;;222 no) build_queues=false ;;223 *) AC_MSG_ERROR(bad value ${enableval} for --enable-queues) ;;224 esac],[build_queues=$build_queues])225 226 dnl ### Enable asyncworker ##227 AC_ARG_ENABLE(asyncworker,228 AC_HELP_STRING([--enable-asyncworker],229 [Build using asyncworker]),230 [case "${enableval}" in231 yes)232 build_queues=true233 build_asyncworker=true234 ;;235 no)236 build_asyncworker=false237 build_queues=false238 ;;239 *) AC_MSG_ERROR(bad value ${enableval} for --enable-asyncworker) ;;240 esac],[build_asyncworker=$build_asyncworker])241 242 AM_CONDITIONAL(BUILD_ASYNCWORKER, test x$build_asyncworker = xtrue)243 AM_CONDITIONAL(BUILD_QUEUES, test x$build_queues = xtrue)244 245 214 246 215 dnl ### Enable building the unit tests ## … … 341 310 AC_SUBST(LIBTINYMAIL_CFLAGS) 342 311 AC_SUBST(LIBTINYMAIL_LIBS) 343 344 if test x$build_queues = xtrue; then345 PKG_CHECK_MODULES(LIBTINYMAIL_QUEUES, glib-2.0 >= 2.8 gobject-2.0)346 AC_SUBST(LIBTINYMAIL_QUEUES_CFLAGS)347 AC_SUBST(LIBTINYMAIL_QUEUES_LIBS)348 if test x$build_asyncworker = xtrue; then349 PKG_CHECK_MODULES(LIBTINYMAIL_ASYNCWORKER, oasyncworker-1.0 glib-2.0 >= 2.8 gobject-2.0)350 AC_SUBST(LIBTINYMAIL_ASYNCWORKER_CFLAGS)351 AC_SUBST(LIBTINYMAIL_ASYNCWORKER_LIBS)352 fi353 fi354 312 355 313 dnl ### libtinymailui, the ui abstraction library ## … … 565 523 libtinymail-acap/Makefile 566 524 libtinymail-acap/libtinymail-acap.pc 567 libtinymail-queues/Makefile568 libtinymail-queues/libtinymail-queues.pc569 libtinymail-asyncworker/Makefile570 libtinymail-asyncworker/libtinymail-asyncworker.pc571 525 tests/Makefile 572 526 tests/c-demo/Makefile … … 585 539 echo " Enable ACAP features: $build_acap" 586 540 echo " Enable Telepathy features: $build_tp" 587 echo " Build the queues library: $build_queues"588 echo " Build the asyncworker impl: $build_asyncworker"589 541 echo " HTML component: ${with_html_component}" 590 542 echo " Python language bindings: $build_pytinymail" trunk/docs/devel/reference/Makefile.am
r3143 r3187 30 30 --source-dir=$(top_srcdir)/libtinymail-gnomevfs \ 31 31 --source-dir=$(top_srcdir)/libtinymail-gnome-desktop \ 32 --source-dir=$(top_srcdir)/libtinymail-camel \ 33 --source-dir=$(top_srcdir)/libtinymail-queues 32 --source-dir=$(top_srcdir)/libtinymail-camel 34 33 35 34 # Extra options to supply to gtkdoc-scan. … … 55 54 # e.g. HFILE_GLOB=$(top_srcdir)/*.h 56 55 # e.g. CFILE_GLOB=$(top_srcdir)/*.c 57 HFILE_GLOB=$(top_srcdir)/libtinymail/*.h $(top_srcdir)/libtinymailui/*.h $(top_srcdir)/libtinymailui-gtk/*.h $(top_srcdir)/libtinymail-gnomevfs/*.h $(top_srcdir)/libtinymail-camel/*.h $(top_srcdir)/libtinymailui-mozembed/*.h $(top_srcdir)/tests/shared/*.h $(top_srcdir)/libtinymail-queues/*.h56 HFILE_GLOB=$(top_srcdir)/libtinymail/*.h $(top_srcdir)/libtinymailui/*.h $(top_srcdir)/libtinymailui-gtk/*.h $(top_srcdir)/libtinymail-gnomevfs/*.h $(top_srcdir)/libtinymail-camel/*.h $(top_srcdir)/libtinymailui-mozembed/*.h $(top_srcdir)/tests/shared/*.h 58 57 59 CFILE_GLOB=$(top_srcdir)/libtinymail/*.c $(top_srcdir)/libtinymailui/*.c $(top_srcdir)/libtinymailui-gtk/*.c $(top_srcdir)/libtinymail-gnomevfs/*.c $(top_srcdir)/libtinymail-camel/*.c $(top_srcdir)/libtinymailui-mozembed/*.c $(top_srcdir)/tests/shared/*.c $(top_srcdir)/libtinymail-queues/*.c58 CFILE_GLOB=$(top_srcdir)/libtinymail/*.c $(top_srcdir)/libtinymailui/*.c $(top_srcdir)/libtinymailui-gtk/*.c $(top_srcdir)/libtinymail-gnomevfs/*.c $(top_srcdir)/libtinymail-camel/*.c $(top_srcdir)/libtinymailui-mozembed/*.c $(top_srcdir)/tests/shared/*.c 60 59 61 60 # Header files to ignore when scanning. … … 95 94 -I$(top_srcdir)/libtinymail-gnomevfs \ 96 95 -I$(top_srcdir)/tinymail \ 97 -I$(top_srcdir)/tests/shared \ 98 -I$(top_srcdir)/libtinymail-queues \ 99 $(LIBTINYMAIL_ASYNCWORKER_CFLAGS) 96 -I$(top_srcdir)/tests/shared 100 97 101 98 GTKDOC_LIBS= $(LIBTINYMAIL_LIBS) $(LIBTINYMAILUI_LIBS) \ … … 103 100 $(LIBTINYMAILUI_GTK_LIBS) $(LIBTINYMAILUI_MOZEMBED_LIBS) \ 104 101 $(LIBTINYMAIL_GNOME_DESKTOP_LIBS) $(LIBTINYMAIL_TEST_LIBS) \ 105 $(TINYMAIL_LIBS) $(LIBTINYMAIL_ASYNCWORKER_LIBS)\102 $(TINYMAIL_LIBS) \ 106 103 $(LIBTINYMAILUI_WEBKIT_LIBS) \ 107 104 $(top_builddir)/libtinymail/libtinymail-$(API_VERSION).la \ … … 112 109 $(top_builddir)/libtinymail-gnome-desktop/libtinymail-gnome-desktop-$(API_VERSION).la \ 113 110 $(top_builddir)/libtinymail-gnomevfs/libtinymail-gnomevfs-$(API_VERSION).la \ 114 $(top_builddir)/libtinymail-queues/libtinymail-queues-$(API_VERSION).la \115 111 $(top_builddir)/tests/shared/libtestsshared.la 116 112 trunk/docs/devel/reference/libtinymail-docs.sgml
r3151 r3187 102 102 <!ENTITY libtinymail-gnome-desktop-TnyGnomeAccountStore SYSTEM "xml/tny-gnome-account-store.xml"> 103 103 <!ENTITY libtinymail-gnome-desktop-TnyGnomeDevice SYSTEM "xml/tny-gnome-device.xml"> 104 105 <!ENTITY libtinymail-asyncworker-TnyAsyncWorkerQueueTask SYSTEM "xml/tny-async-worker-queue-task.xml">106 <!ENTITY libtinymail-asyncworker-TnyAsyncWorkerQueue SYSTEM "xml/tny-async-worker-queue.xml">107 108 <!-- !ENTITY libtinymail-queues-TnyQueue SYSTEM "xml/tny-queue.xml" //-->109 <!-- !ENTITY libtinymail-queues-TnyQueueTask SYSTEM "xml/tny-queue-task.xml" //-->110 <!-- !ENTITY libtinymail-queues-TnyGenericSendQueue SYSTEM "xml/tny-generic-send-queue.xml" //-->111 <!-- !ENTITY libtinymail-queues-TnyGetMsgQueue SYSTEM "xml/tny-get-msg-queue.xml" //-->112 104 113 105 <!ENTITY index-Object-Tree SYSTEM "xml/tree_index.sgml"> … … 232 224 </chapter> 233 225 234 <!-- chapter id="libtinymail-queues">235 <title>A queue library</title>236 &libtinymail-queues-TnyQueue;237 &libtinymail-queues-TnyQueueTask;238 &libtinymail-queues-TnyGenericSendQueue;239 &libtinymail-queues-TnyGetMsgQueue;240 </chapter //-->241 242 <!-- chapter id="libtinymail-asyncworker">243 <title>A library that implements TnyQueue</title>244 &libtinymail-asyncworker-TnyAsyncWorkerQueueTask;245 &libtinymail-asyncworker-TnyAsyncWorkerQueue;246 </chapter //-->247 248 226 <chapter id="libtinymail-camel"> 249 227 <title>libtinymail-camel - implementation of the main library</title> trunk/tests/c-demo/Makefile.am
r2837 r3187 11 11 if BUILD_GNOME 12 12 INCLUDES += -DGNOME 13 endif14 15 if BUILD_QUEUES16 INCLUDES += -DQUEUES -I$(top_srcdir)/libtinymail-queues17 endif18 19 if BUILD_ASYNCWORKER20 INCLUDES += -DASYNCWORKER -I$(top_srcdir)/libtinymail-asyncworker $(LIBTINYMAIL_ASYNCWORKER_CFLAGS)21 13 endif 22 14 … … 41 33 $(top_builddir)/$(PLATFORMDIR)/$(PLATFORMDIR)-$(API_VERSION).la 42 34 43 if BUILD_QUEUES44 tny_demoui_LDADD += $(top_builddir)/libtinymail-queues/libtinymail-queues-$(API_VERSION).la45 endif46 47 if BUILD_ASYNCWORKER48 tny_demoui_LDADD += $(top_builddir)/libtinymail-asyncworker/libtinymail-asyncworker-$(API_VERSION).la \49 $(LIBTINYMAIL_ASYNCWORKER_LIBS)50 endif51 35 52 36 if BUILD_MOZEMBED
