2011-02-23 [colin] 3.7.8cvs59

[claws.git] / src / common / Makefile.am

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index e3927458b0256ae4e0dc51051c73be1350298f0f..082e026b3c836ab50e55e8a8894abdd06240ff7c 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,11 +1,13 @@
 PLUGINDIR = $(pkglibdir)/plugins/
+DESKTOPFILEPATH=$(datadir)/applications/claws-mail.desktop
+
 noinst_LTLIBRARIES = libclawscommon.la
 
 if OS_WIN32
 arch_sources = fnmatch.c \
                w32_dirent.c w32_reg.c w32_signal.c w32_stat.c \
                w32_stdio.c w32_stdlib.c w32_string.c w32_time.c \
-               w32_unistd.c w32_wait.c
+               w32_unistd.c w32_wait.c w32_account.c
 arch_headers = fnmatch.h w32lib.h
 else
 arch_files = 
@@ -18,7 +20,6 @@ libclawscommon_la_SOURCES = $(arch_sources) \
        log.c \
        md5.c \
        mgutils.c \
-       nntp.c \
        passcrypt.c \
        plugin.c \
        prefs.c \
@@ -32,6 +33,7 @@ libclawscommon_la_SOURCES = $(arch_sources) \
        string_match.c \
        stringtable.c \
        claws.c \
+       tags.c \
        template.c \
        utils.c \
        uuencode.c \
@@ -46,7 +48,6 @@ clawscommoninclude_HEADERS = $(arch_headers) \
        log.h \
        md5.h \
        mgutils.h \
-       nntp.h \
        passcrypt.h \
        plugin.h \
        prefs.h \
@@ -60,11 +61,11 @@ clawscommoninclude_HEADERS = $(arch_headers) \
        string_match.h \
        stringtable.h \
        claws.h \
+       tags.h \
        template.h \
        timing.h \
        utils.h \
        uuencode.h \
-       valgrind.h \
        version.h \
        xml.h \
        xmlprops.h
@@ -74,18 +75,21 @@ INCLUDES = \
 
 AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
-       $(OPENSSL_CFLAGS) \
        $(MAEMO_CFLAGS) \
+       $(VALGRIND_CFLAGS) \
        -DLOCALEDIR=\""$(localedir)"\" \
-       -DPLUGINDIR=\"$(PLUGINDIR)\" 
+       -DPLUGINDIR=\"$(PLUGINDIR)\" \
+       -DDATAROOTDIR=\""$(datarootdir)"\" \
+       -DDESKTOPFILEPATH=\"$(DESKTOPFILEPATH)\" \
+       -DGTK_DISABLE_DEPRECATED
 
 libclawscommon_la_LIBADD = \
        $(GLIB_LIBS) \
-       $(OPENSSL_LIBS) \
        $(CRYPT_LIBS) \
        $(PTHREAD_LIBS) \
        $(MAEMO_LIBS)
 
 EXTRA_DIST = \
+       valgrind.h \
        version.h.in fnmatch_loop.c