Changeset 675

Show
Ignore:
Timestamp:
08/01/06 12:13:03
Author:
pvanhoof
Message:

Simplified the makefile

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Makefile.am

    r597 r675  
     1SUBDIRS = m4 libtinymail libtinymailui 
     2 
     3if BUILD_GNOME 
     4SUBDIRS += libtinymail-gnomevfs 
     5endif 
     6 
     7SUBDIRS += libtinymailui-gtk 
     8 
     9if BUILD_MOZEMBED 
     10SUBDIRS += libtinymailui-mozembed 
     11endif 
     12 
     13SUBDIRS += $(PLATFORMDIR) libtinymail-camel tinymail docs 
     14 
    115if BUILD_UNITTESTS 
    2 UNITTESTDIR = libtinymail-test  
     16SUBDIRS += libtinymail-test  
    317endif 
    4 if BUILD_MOZEMBED 
    5 MOZEMBEDDIR = libtinymailui-mozembed 
    6 endif 
    7 if BUILD_GNOME 
    8 TNYVFSDIR=libtinymail-gnomevfs 
    9 endif 
    10 SUBDIRS = m4 libtinymail libtinymailui $(TNYVFSDIR) libtinymailui-gtk $(MOZEMBEDDIR) $(PLATFORMDIR) libtinymail-camel tinymail docs $(UNITTESTDIR) bindings po 
     18 
     19SUBDIRS += bindings po 
    1120 
    1221DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc 

  • trunk/libtinymail-test/tny-test-stream.h

    r158 r675  
    2222 
    2323#include <glib.h> 
     24#ifdef GNOME 
    2425#include <libgnomevfs/gnome-vfs.h> 
     26#endif 
    2527#include <glib-object.h> 
    2628