Changeset 96

Show
Ignore:
Timestamp:
02/20/06 20:05:26
Author:
pvanhoof
Message:

Building blocks gnomevfs lib

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Makefile.am

    r95 r96  
    1 SUBDIRS = libtinymail libtinymail-camel libtinymailui libtinymailui-gtk tinymail 
     1SUBDIRS = libtinymail libtinymail-camel libtinymailui libtinymailui-gtk libtinymail-gnomevfs tinymail 

  • trunk/configure.ac

    r95 r96  
    66AM_CONFIG_HEADER(libtinymail/config.h) 
    77AM_CONFIG_HEADER(libtinymail-camel/config.h) 
     8AM_CONFIG_HEADER(libtinymail-gnomevfs/config.h) 
    89AM_CONFIG_HEADER(libtinymailui/config.h) 
     10AM_CONFIG_HEADER(libtinymailui-gtk/config.h) 
    911 
    1012API_VERSION=1.0 
    …… 
    3032AC_SUBST(LIBTINYMAILUI_LIBS) 
    3133 
    32 PKG_CHECK_MODULES(LIBTINYMAILCAMEL, glib-2.0 >= 2.8 gobject-2.0 camel-1.2 camel-provider-1.2) 
    33 AC_SUBST(LIBTINYMAILCAMEL_CFLAGS) 
    34 AC_SUBST(LIBTINYMAILCAMEL_LIBS) 
     34PKG_CHECK_MODULES(LIBTINYMAIL_CAMEL, glib-2.0 >= 2.8 gobject-2.0 camel-1.2 camel-provider-1.2) 
     35AC_SUBST(LIBTINYMAIL_CAMEL_CFLAGS) 
     36AC_SUBST(LIBTINYMAIL_CAMEL_LIBS) 
     37 
     38PKG_CHECK_MODULES(LIBTINYMAIL_GNOMEVFS, glib-2.0 >= 2.8 gobject-2.0 gnome-vfs-2.0) 
     39AC_SUBST(LIBTINYMAIL_GNOMEVFS_CFLAGS) 
     40AC_SUBST(LIBTINYMAIL_GNOMEVFS_LIBS) 
    3541 
    3642dnl gnomeui-2 is for gnome_icon_lookup :-\ 
    37  
    38 PKG_CHECK_MODULES(LIBTINYMAILUI_GTK, libgnomeui-2.0 gtk+-2.0 glib-2.0 >= 2.8 gobject-2.0) 
     43PKG_CHECK_MODULES(LIBTINYMAILUI_GTK, glib-2.0 >= 2.8 gobject-2.0 libgnomeui-2.0 gtk+-2.0) 
    3944AC_SUBST(LIBTINYMAILUI_GTK_CFLAGS) 
    4045AC_SUBST(LIBTINYMAILUI_GTK_LIBS) 
    4146 
    42  
    43 PKG_CHECK_MODULES(TINYMAIL, gconf-2.0 gtk+-2.0 glib-2.0 >= 2.8 gobject-2.0) 
     47dnl Try to remove the gtk+ and gconf dependency by refactoring to libraries 
     48PKG_CHECK_MODULES(TINYMAIL, glib-2.0 >= 2.8 gobject-2.0 gconf-2.0 gtk+-2.0) 
    4449AC_SUBST(TINYMAIL_CFLAGS) 
    4550AC_SUBST(TINYMAIL_LIBS) 
    …… 
    5964libtinymailui-gtk/Makefile 
    6065libtinymailui-gtk/libtinymailui-gtk.pc 
     66libtinymail-gnomevfs/Makefile 
     67libtinymail-gnomevfs/libtinymail-gnomevfs.pc 
    6168tinymail/Makefile 
    6269]) 

  • trunk/libtinymail-camel/Makefile.am

    r60 r96  
    1 INCLUDES = $(LIBTINYMAILCAMEL_CFLAGS) -I.     \ 
     1INCLUDES = $(LIBTINYMAIL_CAMEL_CFLAGS) -I.    \ 
    22        -I$(top_builddir)/libtinymail 
    33 
    …… 
    3030 
    3131libtinymail_camel_1_0_la_LIBADD =               \ 
    32         $(LIBTINYMAILCAMEL_LIBS)              \ 
     32        $(LIBTINYMAIL_CAMEL_LIBS)             \ 
    3333        $(top_builddir)/libtinymail/libtinymail-$(API_VERSION).la 
    3434 

  • trunk/libtinymail-camel/libtinymail-camel.pc.in

    r1 r96  
    33libdir=@libdir@ 
    44includedir=@includedir@ 
    5 satmode_serverdir=@libexecdir@ 
    65 
    7 Name: libtinymail  
     6Name: libtinymail-camel  
    87Description: TinyMail generic library implemented for camel 
    98Version: @VERSION@ 

  • trunk/libtinymail/libtinymail.pc.in

    r1 r96  
    33libdir=@libdir@ 
    44includedir=@includedir@ 
    5 satmode_serverdir=@libexecdir@ 
    65 
    76Name: libtinymail  

  • trunk/libtinymailui-gtk/libtinymailui-gtk.pc.in

    r95 r96  
    33libdir=@libdir@ 
    44includedir=@includedir@ 
    5 satmode_serverdir=@libexecdir@ 
    65 
    76Name: libtinymailui-gtk 

  • trunk/libtinymailui/libtinymailui.pc.in

    r1 r96  
    33libdir=@libdir@ 
    44includedir=@includedir@ 
    5 satmode_serverdir=@libexecdir@ 
    65 
    76Name: libtinymailui