2011-02-23 [colin] 3.7.8cvs59

[claws.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index dfb4f546d756ab53fe609f5367d258e1f5608e00..ba0af16dbde6df75e925c87379f9c41136545d3f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ etpan_dir =
 etpan_library = 
 endif
 
-SUBDIRS = common gtk $(etpan_dir) . plugins
+SUBDIRS = common gtk $(etpan_dir) . plugins 
 
 bin_PROGRAMS = claws-mail
 install-exec-hook:
@@ -48,6 +48,7 @@ claws_mail_SOURCES = \
        addrselect.c \
        addrduplicates.c \
        alertpanel.c \
+       autofaces.c \
        browseldap.c \
        codeconv.c \
        compose.c \
@@ -75,7 +76,6 @@ claws_mail_SOURCES = \
        foldersel.c \
        folderutils.c \
        folderview.c \
-       gedit-print.c \
        grouplistdialog.c \
        headerview.c \
        html.c \
@@ -196,6 +196,7 @@ claws_mailinclude_HEADERS = \
        addrselect.h \
        addrduplicates.h \
        alertpanel.h \
+       autofaces.h \
        browseldap.h \
        codeconv.h \
        compose.h \
@@ -223,7 +224,6 @@ claws_mailinclude_HEADERS = \
        foldersel.h \
        folderutils.h \
        folderview.h \
-       gedit-print.h \
        grouplistdialog.h \
        headerview.h \
        html.h \
@@ -334,11 +334,16 @@ EXTRA_DIST = \
        pixmaps/address.xpm \
        pixmaps/anonymous.xpm \
        pixmaps/book.xpm \
+       pixmaps/cancel.xpm \
        pixmaps/category.xpm \
        pixmaps/checkbox_off.xpm \
        pixmaps/checkbox_on.xpm \
        pixmaps/check_spelling.xpm \
        pixmaps/clipkey.xpm \
+       pixmaps/claws-mail_icon.xpm \
+       pixmaps/claws-mail_logo.xpm \
+       pixmaps/claws-mail_logo-small.xpm \
+       pixmaps/claws-mail.xpm \
        pixmaps/clip.xpm \
        pixmaps/clip_gpg_signed.xpm \
        pixmaps/close.xpm \
@@ -373,6 +378,7 @@ EXTRA_DIST = \
        pixmaps/insert_file.xpm \
        pixmaps/jpilot.xpm \
        pixmaps/key.xpm \
+       pixmaps/key_gpg_signed.xpm \
        pixmaps/ldap.xpm \
        pixmaps/linewrap.xpm \
        pixmaps/linewrapcurrent.xpm \
@@ -449,10 +455,6 @@ EXTRA_DIST = \
        pixmaps/selection.xpm \
        pixmaps/spam.xpm \
        pixmaps/spam_btn.xpm \
-       pixmaps/claws-mail_icon.xpm \
-       pixmaps/claws-mail_logo.xpm \
-       pixmaps/claws-mail_logo-small.xpm \
-       pixmaps/claws-mail.xpm \
        pixmaps/trash_hrm.xpm \
        pixmaps/trash.xpm \
        pixmaps/trash_btn.xpm \
@@ -510,17 +512,15 @@ claws_mail_DEPENDENCIES = $(claws_mail_deps) \
 claws_mail_LDADD = \
        $(etpan_library) \
        gtk/libclawsgtk.la \
-       $(ASPELL_LIBS) \
+       $(ENCHANT_LIBS) \
        $(INTLLIBS) \
        $(GTK_LIBS) \
        $(GPGME_LIBS) \
        $(LDAP_LIBS) \
-       $(OPENSSL_LIBS) \
        $(GNUTLS_LIBS) \
        $(COMPFACE_LIBS) \
        $(JPILOT_LIBS) \
        $(PTHREAD_LIBS) \
-       $(GNOMEPRINT_LIBS) \
        $(SM_LIBS) \
        $(LIBICONV) \
        $(STARTUP_NOTIFICATION_LIBS) \
@@ -540,17 +540,16 @@ AM_CPPFLAGS = \
        -DTARGET_ALIAS=\""$(target_triplet)"\" \
        -DSYSCONFDIR=\""$(sysconfdir)"\" \
        -DDATAROOTDIR=\""$(datarootdir)"\" \
-       $(ASPELL_CFLAGS) \
+       $(ENCHANT_CFLAGS) \
        $(GTK_CFLAGS) \
        $(GPGME_CFLAGS) \
-       $(OPENSSL_CFLAGS) \
-       $(GNOMEPRINT_CFLAGS) \
        $(LIBETPAN_CPPFLAGS) \
        $(STARTUP_NOTIFICATION_CFLAGS) \
        $(MAEMO_CFLAGS) \
        $(CONIC_CFLAGS) \
        $(DBUS_CFLAGS) \
-  $(NETWORKMANAGER_SUPPORT_CFLAGS)
+       $(NETWORKMANAGER_SUPPORT_CFLAGS) \
+       $(VALGRIND_CFLAGS)
 
 #no-unused-function is there because of bison stuff
 #no-deprecated-declarations because of gpgme_data_rewind, which we have