Rename a few build variables for overall consistency

pull/21/head
Timothy Pearson 11 years ago
parent b9ef732a4a
commit 8e2ffd2cc8

@ -109,13 +109,13 @@ option( BUILD_KORGANIZER "Build korganizer" ${BUILD_ALL} )
option( BUILD_PLUGINS "Build plugins" ${BUILD_ALL} )
option( BUILD_KNOTES "Build knotes" ${BUILD_ALL} )
option( BUILD_KODE "Build kode" ${BUILD_ALL} )
option( BUILD_KRESOURCES "Build tderesources" ${BUILD_ALL} )
option( BUILD_TDERESOURCES "Build tderesources" ${BUILD_ALL} )
option( BUILD_WIZARDS "Build wizards" ${BUILD_ALL} )
option( BUILD_KABC "Build kabc" ${BUILD_ALL} )
option( BUILD_KONSOLEKALENDAR "Build konsolekalendar" ${BUILD_ALL} )
option( BUILD_KMAILCVT "Build kmailcvt" ${BUILD_ALL} )
option( BUILD_KARM "Build karm" ${BUILD_ALL} )
option( BUILD_KFILE_PLUGINS "Build tdefile-plugins" ${BUILD_ALL} )
option( BUILD_TDEFILE_PLUGINS "Build tdefile-plugins" ${BUILD_ALL} )
option( BUILD_KANDY "Build kandy" ${BUILD_ALL} )
option( BUILD_KNODE "Build knode" ${BUILD_ALL} )
option( BUILD_KMOBILE "Build kmobile" ${BUILD_ALL} )
@ -148,7 +148,7 @@ if( BUILD_LIBKCAL OR BUILD_LIBTDEPIM OR BUILD_LIBKPIMIDENTITIES OR BUILD_KIOSLAV
add_subdirectory( libemailfunctions )
endif()
if( BUILD_KADDRESSBOOK OR (BUILD_KRESOURCES AND (WITH_EGROUPWARE OR WITH_BIRTHDAYS)) )
if( BUILD_KADDRESSBOOK OR (BUILD_TDERESOURCES AND (WITH_EGROUPWARE OR WITH_BIRTHDAYS)) )
add_subdirectory( kaddressbook/common )
endif()
@ -181,13 +181,13 @@ tde_conditional_add_subdirectory( BUILD_KORGANIZER korganizer )
tde_conditional_add_subdirectory( BUILD_PLUGINS plugins )
tde_conditional_add_subdirectory( BUILD_KNOTES knotes )
tde_conditional_add_subdirectory( BUILD_KODE kode )
tde_conditional_add_subdirectory( BUILD_KRESOURCES tderesources )
tde_conditional_add_subdirectory( BUILD_TDERESOURCES tderesources )
tde_conditional_add_subdirectory( BUILD_WIZARDS wizards )
tde_conditional_add_subdirectory( BUILD_KABC kabc )
tde_conditional_add_subdirectory( BUILD_KONSOLEKALENDAR konsolekalendar )
tde_conditional_add_subdirectory( BUILD_KMAILCVT kmailcvt )
tde_conditional_add_subdirectory( BUILD_KARM karm )
tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS tdefile-plugins )
tde_conditional_add_subdirectory( BUILD_TDEFILE_PLUGINS tdefile-plugins )
tde_conditional_add_subdirectory( BUILD_KANDY kandy )
tde_conditional_add_subdirectory( BUILD_KNODE knode )
tde_conditional_add_subdirectory( BUILD_KMOBILE kmobile )

@ -11,7 +11,7 @@ libakregator_mk4storage_plugin_la_LIBADD = \
$(top_builddir)/akregator/src/mk4storage/metakit/src/libmetakitlocal.la \
$(top_builddir)/akregator/src/librss/librsslocal.la \
../libakregatorprivate.la \
$(LIB_KFILE) \
$(LIB_TDEFILE) \
$(LIB_TDECORE) \
$(LIB_QT) \
$(LIB_TDEUI)

@ -1,5 +1,5 @@
#ifndef LPC_LOCKFILE_H1118420718_INCLUDE_GUARD_
#define LPC_LOCKFILE_H1118420718_INCLUDE_GUARD_
#ifndef LPC_LOCTDEFILE_H1118420718_INCLUDE_GUARD_
#define LPC_LOCTDEFILE_H1118420718_INCLUDE_GUARD_
/* This file is part of indexlib.
* Copyright (C) 2005 Luís Pedro Coelho <luis@luispedro.org>
@ -69,4 +69,4 @@ class lockfile {
#endif /* LPC_LOCKFILE_H1118420718_INCLUDE_GUARD_ */
#endif /* LPC_LOCTDEFILE_H1118420718_INCLUDE_GUARD_ */

@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef PICKFILERADIO_H
#define PICKFILERADIO_H
#ifndef PICTDEFILERADIO_H
#define PICTDEFILERADIO_H
/** @file pictdefileradio.h - radio button with an associated file picker */
@ -118,4 +118,4 @@ class PickFileRadio : public RadioButton
bool mRevertId; // true to revert to the previous radio button selection
};
#endif // PICKFILERADIO_H
#endif // PICTDEFILERADIO_H

@ -3,7 +3,7 @@ bin_PROGRAMS = kandy kandy_client
INCLUDES = -I$(top_srcdir) $(all_includes)
kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kandy_LDADD = $(KANDY_LIBLOCKDEV) $(LIB_KFILE) -lkabc $(top_builddir)/libtdepim/libtdepim.la
kandy_LDADD = $(KANDY_LIBLOCKDEV) $(LIB_TDEFILE) -lkabc $(top_builddir)/libtdepim/libtdepim.la
kandy_SOURCES = main.cpp kandy.cpp \
cmdpropertiesdialog_base.ui cmdpropertiesdialog.cpp \
kandyview.cpp \

@ -118,7 +118,7 @@ ProcmailRCParser::ProcmailRCParser(TQString fname)
mProcmailrc.setName(fname);
}
TQRegExp lockFileGlobal("^LOCKFILE=", true);
TQRegExp lockFileGlobal("^LOCTDEFILE=", true);
TQRegExp lockFileLocal("^:0", true);
if( mProcmailrc.open(IO_ReadOnly) ) {

@ -8,7 +8,7 @@ kmailcvt_SOURCES = kimportpagedlg.ui kimportpage.cpp kselfilterpagedlg.ui \
filter_kmail_maildir.cxx filter_sylpheed.cxx filter_thebat.cxx \
filter_lnotes.cxx filter_kmail_archive.cxx
kmailcvt_LDADD = $(LIB_KFILE)
kmailcvt_LDADD = $(LIB_TDEFILE)
EXTRA_DIST = main.cpp kmailcvt.cpp kimportpage.cpp kimportpage.h \
kselfilterpage.cpp kselfilterpage.h kmailcvt.h \

@ -9,7 +9,7 @@ lib_LTLIBRARIES = libkmobiledevice.la libkmobileclient.la
INCLUDES = $(all_includes)
kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kmobile_LDADD = $(LIB_KFILE) $(LIB_KABC) libkmobiledevice.la
kmobile_LDADD = $(LIB_TDEFILE) $(LIB_KABC) libkmobiledevice.la
kmobile_SOURCES = main.cpp kmobile.cpp kmobileview.cpp kmobileitem.cpp\
pref.cpp kmobileiface.skel kmobile_selectiondialog.ui \
systemtray.cpp

@ -26,7 +26,7 @@ kcm_knode_la_LIBADD = libknodecommon.la $(LIB_TDECORE)
knconfigpages.lo: smtpaccountwidget_base.h
libknodecommon_la_LDFLAGS = -version-info 3:0:0 -no-undefined $(all_libraries)
libknodecommon_la_LIBADD = $(top_builddir)/libkmime/libkmime.la $(top_builddir)/libkpgp/libkpgp.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KSPELL) $(LIB_KABC) $(LIB_KFILE) $(LIB_KUTILS) $(LIBRESOLV) $(LIB_TDEHTML)
libknodecommon_la_LIBADD = $(top_builddir)/libkmime/libkmime.la $(top_builddir)/libkpgp/libkpgp.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KSPELL) $(LIB_KABC) $(LIB_TDEFILE) $(LIB_KUTILS) $(LIBRESOLV) $(LIB_TDEHTML)
libknodecommon_la_SOURCES = knconfigmanager.cpp \
knconfig.cpp \
knconfigwidgets.cpp \

@ -62,7 +62,7 @@ libkorganizer_la_LIBADD = \
$(top_builddir)/libemailfunctions/libemailfunctions.la \
$(top_builddir)/libkholidays/libkholidays.la \
$(top_builddir)/libkmime/libkmime.la \
$(LIB_KPARTS) $(LIB_KFILE) $(LIB_KNEWSTUFF) \
$(LIB_KPARTS) $(LIB_TDEFILE) $(LIB_KNEWSTUFF) \
-ltdeprint -lkabc -ltdeutils
libkorganizer_la_COMPILE_FIRST = \

@ -9,7 +9,7 @@ METASOURCES = AUTO
bin_PROGRAMS = korn
korn_LDADD = $(LIB_KIO) $(top_builddir)/libkmime/libkmime.la
#korn_LDADD = $(top_builddir)/mimelib/libmimelib.la $(LIB_KFILE) $(LIBSOCKET) $(top_builddir)/libkmime/libkmime.la
#korn_LDADD = $(top_builddir)/mimelib/libmimelib.la $(LIB_TDEFILE) $(LIBSOCKET) $(top_builddir)/libkmime/libkmime.la
korn_SOURCES = \
accountmanager.cpp \

@ -5,7 +5,7 @@ SUBDIRS = pics
bin_PROGRAMS = ktnef
ktnef_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
ktnef_LDADD = $(LIB_KFILE) $(top_builddir)/ktnef/lib/libktnef.la
ktnef_LDADD = $(LIB_TDEFILE) $(top_builddir)/ktnef/lib/libktnef.la
ktnef_SOURCES = ktnefmain.cpp ktnefview.cpp attachpropertydialogbase.ui \
attachpropertydialog.cpp messagepropertydialog.cpp \
qwmf.cpp main.cpp

@ -137,7 +137,7 @@ _assuan_log_print_buffer (FILE *fp, const void *buffer, size_t length)
fwrite (buffer, length, 1, fp);
else
{
#ifdef HAVE_FLOCKFILE
#ifdef HAVE_FLOCTDEFILE
flockfile (fp);
#endif
putc_unlocked ('[', fp);
@ -154,7 +154,7 @@ _assuan_log_print_buffer (FILE *fp, const void *buffer, size_t length)
}
putc_unlocked (' ', fp);
putc_unlocked (']', fp);
#ifdef HAVE_FUNLOCKFILE
#ifdef HAVE_FUNLOCTDEFILE
funlockfile (fp);
#endif
}
@ -171,7 +171,7 @@ _assuan_log_sanitized_string (const char *string)
if (! *s)
return;
#ifdef HAVE_FLOCKFILE
#ifdef HAVE_FLOCTDEFILE
flockfile (fp);
#endif
@ -218,7 +218,7 @@ _assuan_log_sanitized_string (const char *string)
}
}
#ifdef HAVE_FUNLOCKFILE
#ifdef HAVE_FUNLOCTDEFILE
funlockfile (fp);
#endif
}

@ -17,8 +17,8 @@
*
*/
#ifndef KFILE_ICS_H
#define KFILE_ICS_H
#ifndef TDEFILE_ICS_H
#define TDEFILE_ICS_H
#include <tdefilemetainfo.h>

@ -19,8 +19,8 @@
*
*/
#ifndef __KFILE_PALM_H__
#define __KFILE_PALM_H__
#ifndef __TDEFILE_PALM_H__
#define __TDEFILE_PALM_H__
#include <tdefilemetainfo.h>

@ -17,8 +17,8 @@
*
*/
#ifndef __KFILE_RFC822_H__
#define __KFILE_RFC822_H__
#ifndef __TDEFILE_RFC822_H__
#define __TDEFILE_RFC822_H__
#include <tdefilemetainfo.h>

@ -17,8 +17,8 @@
*
*/
#ifndef __KFILE_VCF_H__
#define __KFILE_VCF_H__
#ifndef __TDEFILE_VCF_H__
#define __TDEFILE_VCF_H__
#include <tdefilemetainfo.h>

@ -30,22 +30,22 @@
Boston, MA 02110-1301, USA.
*/
#ifndef KRESOURCES_TDEPIM_EXPORT_H
#define KRESOURCES_TDEPIM_EXPORT_H
#ifndef TDERESOURCES_TDEPIM_EXPORT_H
#define TDERESOURCES_TDEPIM_EXPORT_H
/** Exports a function returning tderesources plugin factory, for resource class @a resourceclass,
* @a resourceconfigclass config class and @a catalog catalog.
*/
#define EXPORT_KRESOURCES_PLUGIN( resourceclass, resourceconfigclass, catalog ) \
#define EXPORT_TDERESOURCES_PLUGIN( resourceclass, resourceconfigclass, catalog ) \
typedef KRES::PluginFactory< resourceclass, resourceconfigclass > FactoryBase; \
class Factory : public FactoryBase { \
public: Factory() { TDEGlobal::locale()->insertCatalogue(catalog); } \
}; \
K_EXPORT_PLUGIN( Factory )
/** Like EXPORT_KRESOURCES_PLUGIN but allows to specify two catalogs.
/** Like EXPORT_TDERESOURCES_PLUGIN but allows to specify two catalogs.
*/
#define EXPORT_KRESOURCES_PLUGIN2( resourceclass, resourceconfigclass, catalog1, catalog2 ) \
#define EXPORT_TDERESOURCES_PLUGIN2( resourceclass, resourceconfigclass, catalog1, catalog2 ) \
typedef KRES::PluginFactory< resourceclass, resourceconfigclass > FactoryBase; \
class Factory : public FactoryBase { \
public: Factory() { TDEGlobal::locale()->insertCatalogue(catalog1); \

@ -32,7 +32,7 @@ using namespace KCal;
========================================================================*/
// Creates the resource factory.
//EXPORT_KRESOURCES_PLUGIN2( ResourceCalDav, ResourceCalDavConfig, "libkcal", "kres_caldav" )
//EXPORT_TDERESOURCES_PLUGIN2( ResourceCalDav, ResourceCalDavConfig, "libkcal", "kres_caldav" )
typedef KRES::PluginFactory<ResourceCalDav, ResourceCalDavConfig> CalDavFactory;

@ -30,22 +30,22 @@
Boston, MA 02110-1301, USA.
*/
#ifndef KRESOURCES_TDEPIM_EXPORT_H
#define KRESOURCES_TDEPIM_EXPORT_H
#ifndef TDERESOURCES_TDEPIM_EXPORT_H
#define TDERESOURCES_TDEPIM_EXPORT_H
/** Exports a function returning tderesources plugin factory, for resource class @a resourceclass,
* @a resourceconfigclass config class and @a catalog catalog.
*/
#define EXPORT_KRESOURCES_PLUGIN( resourceclass, resourceconfigclass, catalog ) \
#define EXPORT_TDERESOURCES_PLUGIN( resourceclass, resourceconfigclass, catalog ) \
typedef KRES::PluginFactory< resourceclass, resourceconfigclass > FactoryBase; \
class Factory : public FactoryBase { \
public: Factory() { TDEGlobal::locale()->insertCatalogue(catalog); } \
}; \
K_EXPORT_PLUGIN( Factory )
/** Like EXPORT_KRESOURCES_PLUGIN but allows to specify two catalogs.
/** Like EXPORT_TDERESOURCES_PLUGIN but allows to specify two catalogs.
*/
#define EXPORT_KRESOURCES_PLUGIN2( resourceclass, resourceconfigclass, catalog1, catalog2 ) \
#define EXPORT_TDERESOURCES_PLUGIN2( resourceclass, resourceconfigclass, catalog1, catalog2 ) \
typedef KRES::PluginFactory< resourceclass, resourceconfigclass > FactoryBase; \
class Factory : public FactoryBase { \
public: Factory() { TDEGlobal::locale()->insertCatalogue(catalog1); \

Loading…
Cancel
Save