0.8.6claws109

[claws.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 3f76751bcfd01604b805edced8361a9e9afc6048..423277a988f8143db0895bbcb362cecef97228fc 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = common gtk
+
 bin_PROGRAMS = sylpheed
 
 sylpheed_SOURCES = \
@@ -19,26 +21,21 @@ sylpheed_SOURCES = \
        folder.c folder.h \
        procmsg.c procmsg.h \
        procheader.c procheader.h \
-       filter.c filter.h \
        compose.c compose.h \
-       gtkshruler.c gtkshruler.h \
-       gtksctree.c gtksctree.h \
-       gtkstext.c gtkstext.h \
        menu.c menu.h \
        stock_pixmap.c stock_pixmap.h \
        prefs.c prefs.h \
        prefs_common.c prefs_common.h \
-       prefs_filter.c prefs_filter.h \
        prefs_account.c prefs_account.h \
        prefs_folder_item.c prefs_folder_item.h \
        prefs_display_header.c prefs_display_header.h \
        prefs_customheader.c prefs_customheader.h \
        prefs_summary_column.c prefs_summary_column.h \
        prefs_template.c prefs_template.h \
+       prefs_actions.c prefs_actions.h \
        account.c account.h \
        displayheader.c displayheader.h \
        customheader.c customheader.h \
-       template.c template.h \
        addressbook.c addressbook.h \
        addr_compl.c addr_compl.h \
        addressitem.h \
@@ -77,7 +74,6 @@ sylpheed_SOURCES = \
        statusbar.c statusbar.h \
        logwindow.c logwindow.h \
        sourcewindow.c sourcewindow.h \
-       manage_window.c manage_window.h \
        undo.c undo.h \
        alertpanel.c alertpanel.h \
        inputdialog.c inputdialog.h \
@@ -85,19 +81,11 @@ sylpheed_SOURCES = \
        grouplistdialog.c grouplistdialog.h \
        about.c about.h \
        setup.c setup.h \
-       utils.c utils.h \
        gtkutils.c gtkutils.h \
        codeconv.c codeconv.h \
        unmime.c unmime.h \
-       base64.c base64.h \
-       uuencode.c uuencode.h \
-       md5.c md5.h \
-       rfc822.c rfc822.h \
-       socket.c socket.h \
-       ssl.c ssl.h \
+       ssl_manager.c ssl_manager.h \
        automaton.c automaton.h \
-       session.c session.h \
-       smtp.c smtp.h \
        pop.c pop.h \
        mh.c mh.h \
        mbox.c mbox.h \
@@ -106,7 +94,6 @@ sylpheed_SOURCES = \
        inc.c inc.h \
        import.c import.h \
        export.c export.h \
-       nntp.c nntp.h \
        news.c news.h \
        imap.c imap.h \
        xml.c xml.h \
@@ -125,18 +112,21 @@ sylpheed_SOURCES = \
        matcher.c matcher.h \
        prefs_matcher.c prefs_matcher.h \
        prefs_scoring.c prefs_scoring.h \
-       prefs_actions.c prefs_actions.h \
        filtering.c filtering.h \
        prefs_filtering.c prefs_filtering.h \
        mbox_folder.c mbox_folder.h \
        quote_fmt_lex.l quote_fmt_lex.h \
        quote_fmt_parse.y quote_fmt.c quote_fmt.h \
-       gtkspell.c gtkspell.h gtkxtext.h \
+       gtkaspell.c gtkaspell.h gtkxtext.h \
        matcher_parser_lex.l matcher_parser_lex.h \
        matcher_parser_parse.y matcher_parser.h matcher_parser_parse.h \
        string_match.h string_match.c \
        selective_download.c selective_download.h \
-       msgcache.h msgcache.c
+       msgcache.h msgcache.c \
+       noticeview.h noticeview.c \
+       toolbar.c toolbar.h \
+       prefs_toolbar.c prefs_toolbar.h \
+       crash.c crash.h
 
 BUILT_SOURCES = \
        quote_fmt_lex.c \
@@ -209,28 +199,35 @@ EXTRA_DIST = \
        pixmaps/up_arrow.xpm \
        pixmaps/vcard.xpm \
        pixmaps/work_offline.xpm \
-       pixmaps/work_online.xpm
+       pixmaps/work_online.xpm \
+       pixmaps/notice_warn.xpm \
+       pixmaps/notice_error.xpm \
+       pixmaps/notice_note.xpm \
+       pixmaps/quicksearch.xpm
 
 INCLUDES = \
+       -Icommon \
+       -Igtk \
        -DG_LOG_DOMAIN=\"Sylpheed\" \
-       -I$(top_srcdir)/libkcc \
        -I$(top_srcdir)/intl \
+        $(ASPELL_CFLAGS)    \
        $(GTK_CFLAGS) \
        $(GDK_IMLIB_CFLAGS) \
        $(GDK_PIXBUF_CFLAGS) \
        $(GPGME_CFLAGS) \
-        $(PSPELL_CFLAGS)    \
+       $(OPENSSL_CFLAGS) \
        -I$(includedir)
 
 sylpheed_LDADD = \
-       $(top_builddir)/libkcc/libkcc.a \
+       gtk/libsylpheedgtk.la \
        $(INTLLIBS) \
+       $(ASPELL_LIBS) \
        $(GTK_LIBS) \
        $(GDK_IMLIB_LIBS) \
        $(GDK_PIXBUF_LIBS) \
        $(GPGME_LIBS) \
-        $(PSPELL_LIBS) \
-       $(LDAP_LIBS)
+       $(LDAP_LIBS) \
+       $(OPENSSL_LIBS)
 
 CPPFLAGS = \
        -DLOCALEDIR=\""$(localedir)"\" \