From 7ca753a449ecd35a06aebbfcd22efe69b9692a88 Mon Sep 17 00:00:00 2001 From: Till Adam Date: Sat, 16 Jul 2005 09:21:12 +0000 Subject: [PATCH] SVNSILENT tabs-be-gone svn path=/trunk/KDE/kdepim/; revision=435087 --- Makefile.am | 198 ++++++++++++++++++++++++++-------------------------- 1 file changed, 98 insertions(+), 100 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4bfc6a6e2..5d5c70bc2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,30 +4,30 @@ KDE_CXXFLAGS = $(USE_RTTI) SUBDIRS = interfaces . about pics profiles avscripts tests INCLUDES = -I$(top_srcdir)/libkmime \ - -I$(top_srcdir)/libkpgp \ - -I$(top_srcdir)/libkdenetwork \ - -I$(top_srcdir)/libkdepim \ - -I$(top_srcdir)/libkpimidentities \ - -I$(top_srcdir)/libemailfunctions \ - -I$(top_srcdir)/libksieve \ - -I$(top_srcdir)/mimelib \ - -I$(top_srcdir)/certmanager/lib \ - -I$(top_srcdir) \ - $(GPGME_CFLAGS) \ - $(all_includes) + -I$(top_srcdir)/libkpgp \ + -I$(top_srcdir)/libkdenetwork \ + -I$(top_srcdir)/libkdepim \ + -I$(top_srcdir)/libkpimidentities \ + -I$(top_srcdir)/libemailfunctions \ + -I$(top_srcdir)/libksieve \ + -I$(top_srcdir)/mimelib \ + -I$(top_srcdir)/certmanager/lib \ + -I$(top_srcdir) \ + $(GPGME_CFLAGS) \ + $(all_includes) lib_LTLIBRARIES = libkmailprivate.la libkmailprivate_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined libkmailprivate_la_LIBADD = $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KABC) \ - ../libkmime/libkmime.la ../libkpgp/libkpgp.la ../libkdepim/libkdepim.la \ - ../libkpimidentities/libkpimidentities.la ../mimelib/libmimelib.la \ - ../libksieve/libksieve.la ../libemailfunctions/libemailfunctions.la \ - ../certmanager/lib/libkleopatra.la \ - ../libkcal/libkcal.la + ../libkmime/libkmime.la ../libkpgp/libkpgp.la ../libkdepim/libkdepim.la \ + ../libkpimidentities/libkpimidentities.la ../mimelib/libmimelib.la \ + ../libksieve/libksieve.la ../libemailfunctions/libemailfunctions.la \ + ../certmanager/lib/libkleopatra.la \ + ../libkcal/libkcal.la kde_module_LTLIBRARIES = kcm_kmail.la libkmailpart.la libkmail_bodypartformatter_application_octetstream.la libkmailpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined -libkmailpart_la_LIBADD = libkmailprivate.la +libkmailpart_la_LIBADD = libkmailprivate.la kcm_kmail_la_SOURCES = kcm_kmail.cpp kcm_kmail_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined @@ -44,76 +44,76 @@ kmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) kmail_LDADD = libkmailprivate.la libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \ - configuredialog_p.cpp \ - simplestringlisteditor.cpp kmmsgindex.cpp \ - identitydrag.cpp identitylistview.cpp identitydialog.cpp \ - kmfolderdia.cpp kmfoldertree.cpp kmtransport.cpp \ - kmfoldercombobox.cpp kmaccount.cpp kmheaders.cpp \ + configuredialog_p.cpp \ + simplestringlisteditor.cpp kmmsgindex.cpp \ + identitydrag.cpp identitylistview.cpp identitydialog.cpp \ + kmfolderdia.cpp kmfoldertree.cpp kmtransport.cpp \ + kmfoldercombobox.cpp kmaccount.cpp kmheaders.cpp \ headeritem.cpp listjob.cpp \ - kmcomposewin.cpp kmfolder.cpp kmmsgpartdlg.cpp \ - kmreaderwin.cpp htmlstatusbar.cpp kmmsgdict.cpp \ - kmgroupware.cpp folderstorage.cpp \ - csshelper.cpp klistboxdialog.cpp \ - signatureconfigurationdialog.ui \ - encryptionconfigurationdialog.ui \ - actionscheduler.cpp messageproperty.cpp \ - kmmsgpart.cpp kmmsginfo.cpp \ - kmacctmgr.cpp kmacctfolder.cpp kmdict.cpp \ - kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp \ - kmfoldermgr.cpp kmfoldernode.cpp kmsender.cpp \ - kmacctseldlg.cpp kmfiltermgr.cpp kmsearchpatternedit.cpp \ - kmfilteraction.cpp kmsearchpattern.cpp \ - kmfolderseldlg.cpp kmfilter.cpp kmfilterdlg.cpp \ - kmmsgbase.cpp kmmsglist.cpp kmaddrbook.cpp \ - signatureconfigurator.cpp xfaceconfigurator.cpp \ - networkaccount.cpp imapaccountbase.cpp \ - kmservertest.cpp kmacctimap.cpp kmacctcachedimap.cpp \ - kmfawidgets.cpp kmfoldermbox.cpp kmfolderimap.cpp \ - undostack.cpp kmfoldercachedimap.cpp \ - kmfoldermaildir.cpp popaccount.cpp colorlistbox.cpp \ - kmkernel.cpp kmailIface.skel kmailicalIface.skel \ - accountdialog.cpp searchwindow.cpp vcardviewer.cpp \ - vacationdialog.cpp vacation.cpp sievedebugdialog.cpp \ - sieveconfig.cpp sievejob.cpp \ - kmpopheaders.cpp kmpopfiltercnfrmdlg.cpp \ - kmmimeparttree.cpp \ - certificatehandlingdialog.ui \ - certificatehandlingdialogimpl.cpp \ - certificatewizard.ui certificatewizardimpl.cpp \ - mailinglist-magic.cpp kmacctmaildir.cpp \ - attachmentstrategy.cpp \ - headerstrategy.cpp headerstyle.cpp khtmlparthtmlwriter.cpp \ - filehtmlwriter.cpp teehtmlwriter.cpp \ + kmcomposewin.cpp kmfolder.cpp kmmsgpartdlg.cpp \ + kmreaderwin.cpp htmlstatusbar.cpp kmmsgdict.cpp \ + kmgroupware.cpp folderstorage.cpp \ + csshelper.cpp klistboxdialog.cpp \ + signatureconfigurationdialog.ui \ + encryptionconfigurationdialog.ui \ + actionscheduler.cpp messageproperty.cpp \ + kmmsgpart.cpp kmmsginfo.cpp \ + kmacctmgr.cpp kmacctfolder.cpp kmdict.cpp \ + kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp \ + kmfoldermgr.cpp kmfoldernode.cpp kmsender.cpp \ + kmacctseldlg.cpp kmfiltermgr.cpp kmsearchpatternedit.cpp \ + kmfilteraction.cpp kmsearchpattern.cpp \ + kmfolderseldlg.cpp kmfilter.cpp kmfilterdlg.cpp \ + kmmsgbase.cpp kmmsglist.cpp kmaddrbook.cpp \ + signatureconfigurator.cpp xfaceconfigurator.cpp \ + networkaccount.cpp imapaccountbase.cpp \ + kmservertest.cpp kmacctimap.cpp kmacctcachedimap.cpp \ + kmfawidgets.cpp kmfoldermbox.cpp kmfolderimap.cpp \ + undostack.cpp kmfoldercachedimap.cpp \ + kmfoldermaildir.cpp popaccount.cpp colorlistbox.cpp \ + kmkernel.cpp kmailIface.skel kmailicalIface.skel \ + accountdialog.cpp searchwindow.cpp vcardviewer.cpp \ + vacationdialog.cpp vacation.cpp sievedebugdialog.cpp \ + sieveconfig.cpp sievejob.cpp \ + kmpopheaders.cpp kmpopfiltercnfrmdlg.cpp \ + kmmimeparttree.cpp \ + certificatehandlingdialog.ui \ + certificatehandlingdialogimpl.cpp \ + certificatewizard.ui certificatewizardimpl.cpp \ + mailinglist-magic.cpp kmacctmaildir.cpp \ + attachmentstrategy.cpp \ + headerstrategy.cpp headerstyle.cpp khtmlparthtmlwriter.cpp \ + filehtmlwriter.cpp teehtmlwriter.cpp \ mailcomposerIface.skel objecttreeparser.cpp \ - attachmentcollector.cpp \ - bodypartformatter.cpp bodypartformatterfactory.cpp \ - partNode.cpp signatureconfigurationdialogimpl.cpp \ - encryptionconfigurationdialogimpl.cpp mailsourceviewer.cpp \ - kmcommands.cpp kmreadermainwin.cpp \ - kmstartup.cpp kmmainwidget.cpp \ + attachmentcollector.cpp \ + bodypartformatter.cpp bodypartformatterfactory.cpp \ + partNode.cpp signatureconfigurationdialogimpl.cpp \ + encryptionconfigurationdialogimpl.cpp mailsourceviewer.cpp \ + kmcommands.cpp kmreadermainwin.cpp \ + kmstartup.cpp kmmainwidget.cpp \ folderpropertiesdialog.ui kmfolderindex.cpp \ - kmfoldersearch.cpp transportmanager.cpp \ - folderjob.cpp cachedimapjob.cpp \ - maildirjob.cpp mboxjob.cpp imapjob.cpp \ - subscriptiondialog.cpp kmailicalifaceimpl.cpp aboutdata.cpp \ - folderIface.cpp folderIface.skel mailserviceimpl.cpp \ - attachmentlistview.cpp kmedit.cpp kmlineeditspell.cpp \ + kmfoldersearch.cpp transportmanager.cpp \ + folderjob.cpp cachedimapjob.cpp \ + maildirjob.cpp mboxjob.cpp imapjob.cpp \ + subscriptiondialog.cpp kmailicalifaceimpl.cpp aboutdata.cpp \ + folderIface.cpp folderIface.skel mailserviceimpl.cpp \ + attachmentlistview.cpp kmedit.cpp kmlineeditspell.cpp \ kmatmlistview.cpp composer.cpp \ - isubject.cpp bodyvisitor.cpp antispamwizard.cpp \ - urlhandlermanager.cpp dictionarycombobox.cpp \ - secondarywindow.cpp filterlog.cpp filterlogdlg.cpp \ - korganizeriface.stub messagecomposer.cpp \ - keyresolver.cpp globalsettings.cpp globalsettings_base.kcfgc \ - regexplineedit.cpp rulewidgethandlermanager.cpp \ - headerlistquicksearch.cpp acljobs.cpp folderdiaacltab.cpp \ - partnodebodypart.cpp \ - expirejob.cpp compactionjob.cpp jobscheduler.cpp callback.cpp \ - searchjob.cpp renamejob.cpp \ - composercryptoconfiguration.ui \ - warningconfiguration.ui smimeconfiguration.ui annotationjobs.cpp \ - accountcombobox.cpp redirectdialog.cpp foldershortcutdialog.cpp \ + isubject.cpp bodyvisitor.cpp antispamwizard.cpp \ + urlhandlermanager.cpp dictionarycombobox.cpp \ + secondarywindow.cpp filterlog.cpp filterlogdlg.cpp \ + korganizeriface.stub messagecomposer.cpp \ + keyresolver.cpp globalsettings.cpp globalsettings_base.kcfgc \ + regexplineedit.cpp rulewidgethandlermanager.cpp \ + headerlistquicksearch.cpp acljobs.cpp folderdiaacltab.cpp \ + partnodebodypart.cpp \ + expirejob.cpp compactionjob.cpp jobscheduler.cpp callback.cpp \ + searchjob.cpp renamejob.cpp \ + composercryptoconfiguration.ui \ + warningconfiguration.ui smimeconfiguration.ui annotationjobs.cpp \ + accountcombobox.cpp redirectdialog.cpp foldershortcutdialog.cpp \ folderrequester.cpp \ - spamheaderanalyzer.cpp antispamconfig.cpp \ + spamheaderanalyzer.cpp antispamconfig.cpp \ replyphrases.kcfgc custommimeheader.kcfgc \ recipientseditor.cpp \ recipientspicker.cpp kwindowpositioner.cpp \ @@ -122,9 +122,7 @@ libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \ accountwizard.cpp textsource.cpp \ managesievescriptsdialog.cpp chiasmuskeyselector.cpp -kmail_SOURCES = main.cpp - -libkmailpart_la_SOURCES = kmailpartIface.skel kmail_part.cpp +libkmailpart_la_SOURCES = kmailpartIface.skel kmail_part.cpp check_PROGRAMS = dcoptest recipienteditortest @@ -158,20 +156,20 @@ rc_DATA = kmcomposerui.rc kmmainwin.rc kmreadermainwin.rc eventsrc kmail_part.rc updatedir = $(kde_datadir)/kconf_update update_DATA = kmail.upd update_SCRIPTS = upgrade-transport.pl kmail-pgpidentity.pl \ - upgrade-signature.pl kmail-upd-identities.pl \ + upgrade-signature.pl kmail-upd-identities.pl \ kmail-3.1-use-UOID-for-identities.pl \ kmail-3.1-update-new-mail-notification-settings.pl \ kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl \ - kmail-3.2-update-loop-on-goto-unread-settings.sh \ - kmail-3.2-misc.sh \ - kmail-3.3-use-ID-for-accounts.pl \ - kmail-3.3-move-identities.pl \ - kmail-3.3-aegypten.pl \ - kmail-3.3-split-sign-encr-keys.sh \ - kmail-3.3-misc.pl \ - kmail-3.3b1-misc.pl \ - kmail-3.4-misc.pl \ - kmail-3.4.1-update-status-filters.pl + kmail-3.2-update-loop-on-goto-unread-settings.sh \ + kmail-3.2-misc.sh \ + kmail-3.3-use-ID-for-accounts.pl \ + kmail-3.3-move-identities.pl \ + kmail-3.3-aegypten.pl \ + kmail-3.3-split-sign-encr-keys.sh \ + kmail-3.3-misc.pl \ + kmail-3.3b1-misc.pl \ + kmail-3.4-misc.pl \ + kmail-3.4.1-update-status-filters.pl confdir = $(kde_confdir) conf_DATA = kmail.antispamrc kmail.antivirusrc @@ -187,10 +185,10 @@ kde_services_DATA = kmail_config_misc.desktop kmail_config_appearance.desktop \ kmail_config_security.desktop messages: rc.cpp - rm -f tips.cpp - $(PREPARETIPS) > tips.cpp - $(XGETTEXT) -ktranslate *.cpp *.h -o $(podir)/kmail.pot - rm -f tips.cpp + rm -f tips.cpp + $(PREPARETIPS) > tips.cpp + $(XGETTEXT) -ktranslate *.cpp *.h -o $(podir)/kmail.pot + rm -f tips.cpp kde_kcfg_DATA = kmail.kcfg replyphrases.kcfg custommimeheader.kcfg