[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/kdepim/enterprise/kdepim/kmail
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2010-09-26 21:57:24
Message-ID: 20100926215724.25384AC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1180063 by tmcguire:

We don't really need the application/octetstream formatter here,
so remove it.
There is an internal version for the same mimetype registered
in kmail_create_builtin_bodypart_formatters.

MERGE: none (already in trunk)


 M  +1 -7      Makefile.am  
 D             app_octetstream.cpp  
 D             application_octetstream.desktop  


--- branches/kdepim/enterprise/kdepim/kmail/Makefile.am #1180062:1180063
@@ -34,7 +34,7 @@
         ../libkcal/libkcal.la \
         $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KABC)
 
-kde_module_LTLIBRARIES = kcm_kmail.la libkmailpart.la \
libkmail_bodypartformatter_application_octetstream.la +kde_module_LTLIBRARIES = \
kcm_kmail.la libkmailpart.la  libkmailpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) \
-module -avoid-version -no-undefined  libkmailpart_la_LIBADD  = libkmailprivate.la
 
@@ -42,12 +42,6 @@
 kcm_kmail_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 kcm_kmail_la_LIBADD = libkmailprivate.la $(LIB_KDECORE)
 
-libkmail_bodypartformatter_application_octetstream_la_SOURCES = app_octetstream.cpp
-libkmail_bodypartformatter_application_octetstream_la_LDFLAGS = $(all_libraries) \
                -module $(KDE_PLUGIN)
-
-linkdir = $(kde_datadir)/kmail/plugins/bodypartformatter
-link_DATA = application_octetstream.desktop
-
 bin_PROGRAMS = kmail
 kmail_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 kmail_LDADD   = libkmailprivate.la


[prev in list] [next in list] [prev in thread] [next in thread]