Changeset 3601

Show
Ignore:
Timestamp:
04/20/08 17:45:03
Author:
pvanhoof
Message:

2008-04-20 Philip Van Hoof <pvanhoof@gnome.org>

        • These problems got highlighted during pre-release 0.0.9
        • Build environment improvements
        • Added --enable-debug=yes (default is no),

adds -g -ggdb -O0 -DDEBUG -DDBC to the CFLAGS

        • Added --enable-deprecated=no (default is yes),

adds -DTNY_DISABLE_DEPRECATED to the CFLAGS

        • Removed all %-names in the Makefile.am files since these are a GNU

make ism. There are a few remaining GNU make isms like $(subst ...)
and $(addsuffix ...) who are to be removed / replaced soon

        • Added deprecation marker to gtk-doc-scan's command line
        • Attempt at fixing TnyHeader's documentation
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r3599 r3601  
     12008-04-20  Philip Van Hoof <pvanhoof@gnome.org> 
     2 
     3        * These problems got highlighted during pre-release 0.0.9 
     4        * Build environment improvements 
     5        * Added --enable-debug=yes (default is no),  
     6        adds -g -ggdb -O0 -DDEBUG -DDBC to the CFLAGS 
     7        * Added --enable-deprecated=no (default is yes), 
     8        adds -DTNY_DISABLE_DEPRECATED to the CFLAGS 
     9        * Removed all %-names in the Makefile.am files since these are a GNU 
     10        make ism. There are a few remaining GNU make isms like $(subst ...) 
     11        and $(addsuffix ...) who are to be removed / replaced soon 
     12        * Added deprecation marker to gtk-doc-scan's command line 
     13        * Attempt at fixing TnyHeader's documentation 
     14 
    1152008-04-18  Jose Dapena Paz  <jose@gondomar.wired.citic.igalia.com> 
    216 
    …… 
    1024        cause a deathlock 
    1125        * Decprecated tny_send_queue_add, use tny_send_queue_add_async 
     26        * Pre-release 0.0.9 preparations 
    1227 
    13282008-04-17  Philip Van Hoof <pvanhoof@gnome.org> 

  • trunk/configure.ac

    r3459 r3601  
    7070build_tp=false 
    7171have_conic=false 
     72debug=false 
     73enable_deprecated=true 
    7274PLATFORMDIR=libtinymail-gnome-desktop 
    7375PLATFORMSPECIFICNAME=Gnome 
    7476PLATFORM=1 
     77 
     78dnl ### Debugging ### 
     79AC_ARG_ENABLE(debug, 
     80AC_HELP_STRING([--enable-debug], 
     81  [Enable debugging (yes, no)]), 
     82[case "${enableval}" in 
     83  yes) debug=true ;; 
     84  no)  debug=false ;; 
     85esac],[debug=$debug]) 
     86 
     87dnl ### Deprecated disable ### 
     88AC_ARG_ENABLE(deprecated, 
     89  AC_HELP_STRING([--enable-deprecated], 
     90  [Enable deprecated symbols (yes, no)]), 
     91[case "${enableval}" in 
     92  yes) enable_deprecated=true ;; 
     93  no)  enable_deprecated=false ;; 
     94esac],[enable_deprecated=$enable_deprecated]) 
     95 
    7596 
    7697dnl ### Select the platform library ## 
    …… 
    330351dnl ### libtinymail, the abstraction library ## 
    331352PKG_CHECK_MODULES(LIBTINYMAIL, glib-2.0 >= 2.8 gobject-2.0) 
     353dnl ### libtinymailui, the ui abstraction library ## 
     354PKG_CHECK_MODULES(LIBTINYMAILUI, glib-2.0 >= 2.8 gobject-2.0) 
     355dnl ### libtinymail-camel, a camel implementation of libtinymail ## 
     356PKG_CHECK_MODULES(LIBTINYMAIL_CAMEL, glib-2.0 >= 2.8 gobject-2.0) 
     357 
     358if test x$debug == xtrue; then 
     359        EXTRA_CFLAGS="-DDEBUG -DDBC -g -ggdb -O0" 
     360fi 
     361 
     362if test x$enable_deprecated == xfalse; then 
     363        EXTRA_CFLAGS="$EXTRA_CFLAGS -DTNY_DISABLE_DEPRECATED" 
     364fi 
     365 
     366AC_SUBST(EXTRA_CFLAGS) 
     367AC_SUBST(LIBTINYMAIL_CAMEL_CFLAGS) 
     368AC_SUBST(LIBTINYMAIL_CAMEL_LIBS) 
     369AC_SUBST(LIBTINYMAILUI_CFLAGS) 
     370AC_SUBST(LIBTINYMAILUI_LIBS) 
    332371AC_SUBST(LIBTINYMAIL_CFLAGS) 
    333372AC_SUBST(LIBTINYMAIL_LIBS) 
    334  
    335 dnl ### libtinymailui, the ui abstraction library ## 
    336 PKG_CHECK_MODULES(LIBTINYMAILUI, glib-2.0 >= 2.8 gobject-2.0) 
    337 AC_SUBST(LIBTINYMAILUI_CFLAGS) 
    338 AC_SUBST(LIBTINYMAILUI_LIBS) 
    339  
    340 dnl ### libtinymail-camel, a camel implementation of libtinymail ## 
    341 PKG_CHECK_MODULES(LIBTINYMAIL_CAMEL, glib-2.0 >= 2.8 gobject-2.0) 
    342 AC_SUBST(LIBTINYMAIL_CAMEL_CFLAGS) 
    343 AC_SUBST(LIBTINYMAIL_CAMEL_LIBS) 
    344373 
    345374dnl ### libtinymail-tp, integration with telepathy 

  • trunk/docs/devel/reference/Makefile.am

    r3438 r3601  
    2323 
    2424# Extra options to pass to gtkdoc-scangobj. Not normally needed. 
    25 SCANGOBJ_OPTIONS= 
     25SCANGOBJ_OPTIONS=--deprecated-guards="TNY_DISABLE_DEPRECATED" 
    2626 
    2727TO_SCAN = \ 

  • trunk/docs/devel/reference/tmpl/tny-header.sgml

    r3408 r3601  
    4242 
    4343@g:  
    44 @get_uid:  
    45 @get_bcc:  
    46 @get_cc:  
    47 @get_subject:  
    48 @get_to:  
    49 @get_from:  
    50 @get_replyto:  
    51 @get_message_id:  
     44@dup_uid:  
     45@dup_bcc:  
     46@dup_cc:  
     47@dup_subject:  
     48@dup_to:  
     49@dup_from:  
     50@dup_replyto:  
     51@dup_message_id:  
    5252@get_message_size:  
    5353@get_date_received:  
    …… 
    7979 
    8080 
    81 <!-- ##### FUNCTION tny_header_get_uid ##### --> 
    82 <para> 
    83  
    84 </para> 
    85  
    86 @self:  
    87 @Returns:  
    88  
    89  
    90 <!-- ##### FUNCTION tny_header_get_bcc ##### --> 
    91 <para> 
    92  
    93 </para> 
    94  
    95 @self:  
    96 @Returns:  
    97  
    98  
    99 <!-- ##### FUNCTION tny_header_get_cc ##### --> 
     81<!-- ##### FUNCTION tny_header_dup_uid ##### --> 
     82<para> 
     83 
     84</para> 
     85 
     86@self:  
     87@Returns:  
     88 
     89 
     90<!-- ##### FUNCTION tny_header_dup_bcc ##### --> 
     91<para> 
     92 
     93</para> 
     94 
     95@self:  
     96@Returns:  
     97 
     98 
     99<!-- ##### FUNCTION tny_header_dup_cc ##### --> 
    100100<para> 
    101101 
    …… 
    124124 
    125125 
    126 <!-- ##### FUNCTION tny_header_get_message_id ##### --> 
     126<!-- ##### FUNCTION tny_header_dup_message_id ##### --> 
    127127<para> 
    128128 
    …… 
    142142 
    143143 
    144 <!-- ##### FUNCTION tny_header_get_from ##### --> 
    145 <para> 
    146  
    147 </para> 
    148  
    149 @self:  
    150 @Returns:  
    151  
    152  
    153 <!-- ##### FUNCTION tny_header_get_to ##### --> 
    154 <para> 
    155  
    156 </para> 
    157  
    158 @self:  
    159 @Returns:  
    160  
    161  
    162 <!-- ##### FUNCTION tny_header_get_subject ##### --> 
    163 <para> 
    164  
    165 </para> 
    166  
    167 @self:  
    168 @Returns:  
    169  
    170  
    171 <!-- ##### FUNCTION tny_header_get_replyto ##### --> 
     144<!-- ##### FUNCTION tny_header_dup_from ##### --> 
     145<para> 
     146 
     147</para> 
     148 
     149@self:  
     150@Returns:  
     151 
     152 
     153<!-- ##### FUNCTION tny_header_dup_to ##### --> 
     154<para> 
     155 
     156</para> 
     157 
     158@self:  
     159@Returns:  
     160 
     161 
     162<!-- ##### FUNCTION tny_header_dup_subject ##### --> 
     163<para> 
     164 
     165</para> 
     166 
     167@self:  
     168@Returns:  
     169 
     170 
     171<!-- ##### FUNCTION tny_header_dup_replyto ##### --> 
    172172<para> 
    173173 

  • trunk/libtinymail-acap/Makefile.am

    r1782 r3601  
    11INCLUDES = $(LIBTINYMAIL_CFLAGS) -I. -I$(top_srcdir) \ 
    2         -I$(top_srcdir)/libtinymail 
     2        -I$(top_srcdir)/libtinymail $(EXTRA_CFLAGS) 
    33 
    44lib_LTLIBRARIES = libtinymail-acap-1.0.la 
    …… 
    1616libtinymail_acap_1_0_include_HEADERS = $(libtinymail_acap_1_0_headers) 
    1717 
    18 %-$(API_VERSION).pc: %.pc 
     18libtinymail-acap-$(API_VERSION).pc: libtinymail-acap.pc 
    1919        cp $< $@ 
    2020 

  • trunk/libtinymail-camel/Makefile.am

    r3457 r3601  
    22 
    33INCLUDES = $(LIBTINYMAIL_CAMEL_CFLAGS)          \ 
    4         -I. -I$(top_srcdir)                   \ 
     4        -I. -I$(top_srcdir)  $(EXTRA_CFLAGS)  \ 
    55        -I$(top_srcdir)/libtinymail             \ 
    66        -I$(top_srcdir)/libtinymail-camel/camel-lite  
    …… 
    109109libtinymail_camel_1_0include_HEADERS = $(libtinymail_camel_1_0_headers) 
    110110 
    111 %-$(API_VERSION).pc: %.pc 
     111libtinymail-camel-$(API_VERSION).pc: libtinymail-camel.pc 
    112112        cp $< $@ 
    113113 

  • trunk/libtinymail-camel/camel-lite/camel/Makefile.am

    r3559 r3601  
    1515endif 
    1616 
    17 %-$(API_VERSION).pc: %.pc 
    18          cp $< $@ 
     17camel-lite-$(API_VERSION).pc:camel-lite.pc 
     18        cp $< $@ 
     19 
     20camel-lite-provider-$(API_VERSION).pc:camel-lite-provider.pc 
     21        cp $< $@ 
    1922 
    2023pkgconfigdir = $(libdir)/pkgconfig 

  • trunk/libtinymail-camel/camel-lite/configure.ac

    r3588 r3601  
    7171 
    7272AC_TNY_MOZ_CHECK 
     73 
     74dnl ### Debugging ### 
     75AC_ARG_ENABLE(debug, 
     76AC_HELP_STRING([--enable-debug], 
     77  [Enable debugging (yes, no)]), 
     78[case "${enableval}" in 
     79  yes) debug=true ;; 
     80  no)  debug=false ;; 
     81esac],[debug=$debug]) 
     82 
    7383 
    7484dnl ### Select the SSL implementation ## 
    …… 
    238248CAMEL_CFLAGS="$CAMEL_CFLAGS $LIBCST_CFLAGS $THREADS_CFLAGS $KRB4_CFLAGS $KRB5_CFLAGS" 
    239249CAMEL_LIBS="$CAMEL_LIBS -lz $LIBCST_LIBS $THREADS_LIBS $KRB4_LDFLAGS $KRB5_LDFLAGS" 
     250 
     251if test x$debug == xtrue; then 
     252        CAMEL_CFLAGS="$CAMEL_CFLAGS -ggdb -O0 -DDEBUG" 
     253fi 
    240254 
    241255AC_SUBST(CAMEL_CFLAGS) 

  • trunk/libtinymail-gnome-desktop/Makefile.am

    r3287 r3601  
    1 INCLUDES = -I. -I$(top_srcdir) \ 
     1INCLUDES = -I. -I$(top_srcdir) $(EXTRA_CFLAGS) \ 
    22        $(LIBTINYMAIL_GNOME_DESKTOP_CFLAGS) \ 
    33        $(LIBTINYMAIL_CAMEL_CFLAGS) \ 
    …… 
    4646 
    4747if BUILD_GNOME 
    48 libtinymail_gnome_desktop_1_0_la_LIBADD += $(top_builddir)/libtinymailui-gnome-keyring/libtinymailui-gnome-keyring.a 
     48libtinymail_gnome_desktop_1_0_la_LIBADD += $(top_builddir)/libtinymailui-gnome-keyring/libtinymailui-gnome-keyring.la 
    4949endif 
    5050 
    …… 
    6060libtinymailgnomedesktopinclude_HEADERS = $(libtinymail_gnome_desktop_1_0_headers) 
    6161 
    62 %-$(API_VERSION).pc: %.pc 
     62libtinymail-gnome-desktop-$(API_VERSION).pc: libtinymail-gnome-desktop.pc 
    6363        cp $< $@ 
    6464 

  • trunk/libtinymail-gnomevfs/Makefile.am

    r379 r3601  
    11INCLUDES = $(LIBTINYMAIL_GNOMEVFS_CFLAGS) \ 
    2         -I. -I$(top_srcdir)              \ 
     2        -I. -I$(top_srcdir) $(EXTRA_CFLAGS) \ 
    33        -I$(top_srcdir)/libtinymail 
    44 
    …… 
    2222libtinymail_gnomevfs_1_0include_HEADERS = $(libtinymail_gnomevfs_1_0_headers) 
    2323 
    24 %-$(API_VERSION).pc: %.pc 
     24libtinymail-gnomevfs-$(API_VERSION).pc: libtinymail-gnomevfs.pc 
    2525        cp $< $@ 
    2626 

  • trunk/libtinymail-gpe/Makefile.am

    r1783 r3601  
    1 INCLUDES = -I. -I$(top_srcdir) \ 
     1INCLUDES = -I. -I$(top_srcdir) $(EXTRA_CFLAGS) \ 
    22        $(LIBTINYMAIL_GPE_CFLAGS) \ 
    33        $(LIBTINYMAIL_CAMEL_CFLAGS) \ 
    …… 
    3737libtinymailgpeinclude_HEADERS = $(libtinymail_gpe_1_0_headers) 
    3838 
    39 %-$(API_VERSION).pc: %.pc 
     39libtinymail-gpe-$(API_VERSION).pc: libtinymail-gpe.pc 
    4040        cp $< $@ 
    4141 

  • trunk/libtinymail-maemo/Makefile.am

    r3008 r3601  
    1 INCLUDES = -I. -I$(top_srcdir) \ 
     1INCLUDES = -I. -I$(top_srcdir) $(EXTRA_CFLAGS) \ 
    22        $(LIBTINYMAIL_MAEMO_CFLAGS) \ 
    33        $(LIBTINYMAIL_CAMEL_CFLAGS) \ 
    …… 
    5757libtinymailmaemoinclude_HEADERS = $(libtinymail_maemo_1_0_headers) 
    5858 
    59 %-$(API_VERSION).pc: %.pc 
     59libtinymail-maemo-$(API_VERSION).pc: libtinymail-maemo.pc 
    6060        cp $< $@ 
    6161 

  • trunk/libtinymail-olpc/Makefile.am

    r1783 r3601  
    1 INCLUDES = -I. -I$(top_srcdir) \ 
     1INCLUDES = -I. -I$(top_srcdir) $(EXTRA_CFLAGS) \ 
    22        $(LIBTINYMAIL_OLPC_CFLAGS) \ 
    33        $(LIBTINYMAIL_CAMEL_CFLAGS) \ 
    …… 
    3737libtinymailolpcinclude_HEADERS = $(libtinymail_olpc_1_0_headers) 
    3838 
    39 %-$(API_VERSION).pc: %.pc 
     39libtinymail-olpc-$(API_VERSION).pc: libtinymail-olpc.pc 
    4040        cp $< $@ 
    4141 

  • trunk/libtinymail-test/Makefile.am

    r3078 r3601  
    1 INCLUDES = \ 
     1INCLUDES = $(EXTRA_CFLAGS) \ 
    22        $(CHECK_CFLAGS) \ 
    33        $(LIBTINYMAIL_CFLAGS) \ 

  • trunk/libtinymail-tp/Makefile.am

    r2140 r3601  
    11SUBDIRS = . 
    22 
    3 INCLUDES = $(LIBTINYMAIL_TP_CFLAGS)    \ 
    4         -I. -I$(top_srcdir)                    \ 
     3INCLUDES = $(LIBTINYMAIL_TP_CFLAGS) $(EXTRA_CFLAGS) \ 
     4        -I. -I$(top_srcdir) \ 
    55        -I$(top_srcdir)/libtinymail 
    66 
    …… 
    2323libtinymail_tp_1_0include_HEADERS = $(libtinymail_tp_1_0_headers) 
    2424 
    25 %-$(API_VERSION).pc: %.pc 
     25libtinymail-tp-$(API_VERSION).pc: libtinymail-tp.pc 
    2626        cp $< $@ 
    2727 

  • trunk/libtinymail/Makefile.am

    r3454 r3601  
    1 INCLUDES = $(LIBTINYMAIL_CFLAGS) -I. -I$(top_srcdir) 
     1INCLUDES = $(LIBTINYMAIL_CFLAGS) -I. -I$(top_srcdir) $(EXTRA_CFLAGS) 
    22 
    33lib_LTLIBRARIES = libtinymail-1.0.la 
    …… 
    104104libtinymail_1_0_include_HEADERS = $(libtinymail_1_0_headers) 
    105105 
    106 %-$(API_VERSION).pc: %.pc 
     106libtinymail-$(API_VERSION).pc: libtinymail.pc 
    107107        cp $< $@ 
    108108 

  • trunk/libtinymail/tny-folder-store.h

    r3304 r3601  
    5959 
    6060void tny_folder_store_remove_folder (TnyFolderStore *self, TnyFolder *folder, GError **err); 
    61 TnyFolder *tny_folder_store_create_folder (TnyFolderStore *self, const gchar *name, GError **err); 
    6261void tny_folder_store_create_folder_async (TnyFolderStore *self, const gchar *name, TnyCreateFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data); 
    63 void tny_folder_store_get_folders (TnyFolderStore *self, TnyList *list, TnyFolderStoreQuery *query, GError **err); 
    6462void tny_folder_store_get_folders_async (TnyFolderStore *self, TnyList *list, TnyFolderStoreQuery *query, TnyGetFoldersCallback callback, TnyStatusCallback status_callback, gpointer user_data); 
    6563void tny_folder_store_add_observer (TnyFolderStore *self, TnyFolderStoreObserver *observer); 
    6664void tny_folder_store_remove_observer (TnyFolderStore *self, TnyFolderStoreObserver *observer); 
    6765 
     66#ifndef TNY_DISABLE_DEPRECATED 
     67void tny_folder_store_get_folders (TnyFolderStore *self, TnyList *list, TnyFolderStoreQuery *query, GError **err); 
     68TnyFolder *tny_folder_store_create_folder (TnyFolderStore *self, const gchar *name, GError **err); 
     69#endif 
     70 
    6871G_END_DECLS 
    6972 

  • trunk/libtinymail/tny-folder.h

    r3518 r3601  
    146146TnyMsgReceiveStrategy* tny_folder_get_msg_receive_strategy (TnyFolder *self); 
    147147void tny_folder_set_msg_receive_strategy (TnyFolder *self, TnyMsgReceiveStrategy *st); 
    148 void tny_folder_remove_msg (TnyFolder *self, TnyHeader *header, GError **err); 
    149 void tny_folder_remove_msgs (TnyFolder *self, TnyList *headers, GError **err); 
    150 void tny_folder_add_msg (TnyFolder *self, TnyMsg *msg, GError **err); 
    151148void tny_folder_add_msg_async (TnyFolder *self, TnyMsg *msg, TnyFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data); 
    152 void tny_folder_sync (TnyFolder *self, gboolean expunge, GError **err); 
    153149void tny_folder_sync_async (TnyFolder *self, gboolean expunge, TnyFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data); 
    154 TnyMsg* tny_folder_get_msg (TnyFolder *self, TnyHeader *header, GError **err); 
    155150TnyMsg* tny_folder_find_msg (TnyFolder *self, const gchar *url_string, GError **err); 
    156151void tny_folder_get_msg_async (TnyFolder *self, TnyHeader *header, TnyGetMsgCallback callback, TnyStatusCallback status_callback, gpointer user_data); 
    157 void tny_folder_get_headers (TnyFolder *self, TnyList *headers, gboolean refresh, GError **err); 
    158152void tny_folder_get_headers_async (TnyFolder *self, TnyList *headers, gboolean refresh, TnyGetHeadersCallback callback, TnyStatusCallback status_callback, gpointer user_data); 
    159153TnyAccount* tny_folder_get_account (TnyFolder *self); 
    …… 
    166160gboolean tny_folder_is_subscribed (TnyFolder *self); 
    167161void tny_folder_refresh_async (TnyFolder *self, TnyFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data); 
    168 void tny_folder_refresh (TnyFolder *self, GError **err); 
    169 void tny_folder_transfer_msgs (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, GError **err); 
    170162void tny_folder_transfer_msgs_async (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, TnyTransferMsgsCallback callback, TnyStatusCallback status_callback, gpointer user_data); 
    171 TnyFolder* tny_folder_copy (TnyFolder *self, TnyFolderStore *into, const gchar *new_name, gboolean del, GError **err); 
    172163void tny_folder_copy_async (TnyFolder *self, TnyFolderStore *into, const gchar *new_name, gboolean del,  TnyCopyFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data); 
    173164void tny_folder_poke_status (TnyFolder *self); 
    …… 
    180171void tny_folder_remove_msgs_async (TnyFolder *self, TnyList *headers, TnyFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data); 
    181172 
     173#ifndef TNY_DISABLE_DEPRECATED 
     174TnyFolder* tny_folder_copy (TnyFolder *self, TnyFolderStore *into, const gchar *new_name, gboolean del, GError **err); 
     175void tny_folder_add_msg (TnyFolder *self, TnyMsg *msg, GError **err); 
     176void tny_folder_remove_msg (TnyFolder *self, TnyHeader *header, GError **err); 
     177void tny_folder_remove_msgs (TnyFolder *self, TnyList *headers, GError **err); 
     178TnyMsg* tny_folder_get_msg (TnyFolder *self, TnyHeader *header, GError **err); 
     179void tny_folder_refresh (TnyFolder *self, GError **err); 
     180void tny_folder_transfer_msgs (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, GError **err); 
     181void tny_folder_get_headers (TnyFolder *self, TnyList *headers, gboolean refresh, GError **err); 
     182void tny_folder_sync (TnyFolder *self, gboolean expunge, GError **err); 
     183#endif 
     184 
    182185G_END_DECLS 
    183186 

  • trunk/libtinymailui-gnome-keyring/Makefile.am

    r2978 r3601  
    1 AM_CFLAGS = -fPIC -DPIC 
    2  
    31INCLUDES = -I. -I$(top_srcdir) \ 
    4         $(TINYMAIL_CFLAGS) \ 
     2        $(TINYMAIL_CFLAGS) $(EXTRA_CFLAGS) \ 
    53        $(LIBTINYMAILUI_GTK_CFLAGS) \ 
    64        -I$(top_srcdir)/libtinymail \ 
    …… 
    1614endif 
    1715 
    18 noinst_LIBRARIES = libtinymailui-gnome-keyring.a 
     16noinst_LTLIBRARIES = libtinymailui-gnome-keyring.la 
    1917 
    20 libtinymailui_gnome_keyring_a_SOURCES = \ 
     18libtinymailui_gnome_keyring_la_SOURCES = \ 
    2119        tny-gnome-keyring-password-getter.c \ 
    2220        tny-gnome-keyring-password-getter.h 

  • trunk/libtinymailui-gtk/Makefile.am

    r3040 r3601  
    1 INCLUDES = -I. -I$(top_srcdir)         \ 
     1INCLUDES = -I. -I$(top_srcdir) $(EXTRA_CFLAGS) \ 
    22        $(LIBTINYMAILUI_GTK_CFLAGS)     \ 
    33        -I$(top_srcdir)/libtinymail     \ 
    …… 
    7171libtinymailuigtkinclude_HEADERS = $(libtinymailui_gtk_1_0_headers) 
    7272 
    73 %-$(API_VERSION).pc: %.pc 
     73libtinymailui-gtk-$(API_VERSION).pc: libtinymailui-gtk.pc 
    7474        cp $< $@ 
    7575 

  • trunk/libtinymailui-gtkhtml/Makefile.am

    r3287 r3601  
    1 INCLUDES = -I. -I$(top_srcdir) \ 
     1INCLUDES = -I. -I$(top_srcdir) $(EXTRA_CFLAGS) \ 
    22        $(LIBTINYMAILUI_GTKHTML_CFLAGS) \ 
    33        -I$(top_srcdir)/libtinymail \ 
    …… 
    3838libtinymailuigtkhtmlinclude_HEADERS = $(libtinymailui_gtkhtml_1_0_headers) 
    3939 
    40 %-$(API_VERSION).pc: %.pc 
     40libtinymailui-gtkhtml-$(API_VERSION).pc: libtinymailui-gtkhtml.pc 
    4141        cp $< $@ 
    4242 

  • trunk/libtinymailui-mozembed/Makefile.am

    r2835 r3601  
    1 INCLUDES = -I. -I$(top_srcdir) \ 
     1INCLUDES = -I. -I$(top_srcdir) $(EXTRA_CFLAGS) \ 
    22        $(LIBTINYMAILUI_MOZEMBED_CFLAGS) \ 
    33        -I$(top_srcdir)/libtinymail \ 
    …… 
    4040libtinymailuimozembedinclude_HEADERS = $(libtinymailui_mozembed_1_0_headers) 
    4141 
    42 %-$(API_VERSION).pc: %.pc 
     42libtinymailui-mozembed-$(API_VERSION).pc: libtinymailui-mozembed.pc 
    4343        cp $< $@ 
    4444 

  • trunk/libtinymailui-webkit/Makefile.am

    r2486 r3601  
    1 INCLUDES = -I. -I$(top_srcdir) \ 
     1INCLUDES = -I. -I$(top_srcdir) $(EXTRA_CFLAGS) \ 
    22        $(LIBTINYMAILUI_WEBKIT_CFLAGS) \ 
    33        -I$(top_srcdir)/libtinymail \ 
    …… 
    3838libtinymailuiwebkitinclude_HEADERS = $(libtinymailui_webkit_1_0_headers) 
    3939 
    40 %-$(API_VERSION).pc: %.pc 
     40libtinymailui-webkit-$(API_VERSION).pc: libtinymailui-webkit.pc 
    4141        cp $< $@ 
    4242 

  • trunk/libtinymailui/Makefile.am

    r3082 r3601  
    1 INCLUDES = \ 
     1INCLUDES = $(EXTRA_CFLAGS) \ 
    22        $(LIBTINYMAILUI_CFLAGS) \ 
    33        -I$(top_srcdir)/libtinymail 
    …… 
    3838libtinymailuiinclude_HEADERS = $(libtinymailui_1_0_headers) 
    3939 
    40 %-$(API_VERSION).pc: %.pc 
     40libtinymailui-$(API_VERSION).pc: libtinymailui.pc 
    4141        cp $< $@ 
    4242