Rename a few build variables for overall consistency

pull/1/head
Timothy Pearson 12 years ago
parent 0f2cdace57
commit 6e6db807da

@ -51,7 +51,7 @@ tde_setup_paths( )
##### user requested modules ####################
option( BUILD_ALL "Build all" OFF )
option( BUILD_KFILEREPLACE "Build tdefilereplace" ${BUILD_ALL} )
option( BUILD_TDEFILEREPLACE "Build tdefilereplace" ${BUILD_ALL} )
option( BUILD_QUANTA "Build quanta" ${BUILD_ALL} )
@ -78,7 +78,7 @@ if( BUILD_QUANTA )
add_subdirectory( lib )
endif( )
tde_conditional_add_subdirectory( BUILD_KFILEREPLACE tdefilereplace )
tde_conditional_add_subdirectory( BUILD_TDEFILEREPLACE tdefilereplace )
tde_conditional_add_subdirectory( BUILD_QUANTA quanta )

@ -39,10 +39,10 @@ noinst_HEADERS = \
libkimagemapeditor_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP
libkimagemapeditor_la_LIBADD = libkimagemapeditorcommon.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEHTML)
libkimagemapeditor_la_LIBADD = libkimagemapeditorcommon.la $(LIB_TDEFILE) $(LIB_KPARTS) $(LIB_TDEHTML)
kimagemapeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP
kimagemapeditor_LDADD = libkimagemapeditorcommon.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEHTML)
kimagemapeditor_LDADD = libkimagemapeditorcommon.la $(LIB_TDEFILE) $(LIB_KPARTS) $(LIB_TDEHTML)
# set the include path for X, qt and KDE
INCLUDES= $(all_includes)

@ -37,7 +37,7 @@ kde_module_LTLIBRARIES = libklinkstatuspart.la
libklinkstatuspart_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -lDCOP
libklinkstatuspart_la_LIBADD = ui/settings/libsettings.la \
ui/libui.la engine/libengine.la \
parser/libparser.la utils/libutils.la $(LIB_KPARTS) $(LIB_KFILE)
parser/libparser.la utils/libutils.la $(LIB_KPARTS) $(LIB_TDEFILE)
# this is where the desktop file will go
partdesktopdir = $(kde_servicesdir)

@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/kommander/executor -I$(top_srcdir)/kommander/factory
METASOURCES = AUTO
kde_module_LTLIBRARIES = libkommander_part.la
libkommander_part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP -L../../kommander/plugin/.libs -lkommanderplugin
libkommander_part_la_LIBADD = $(top_builddir)/kommander/executor/libinstance.la $(top_builddir)/kommander/widget/libkommanderwidget.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEHTML)
libkommander_part_la_LIBADD = $(top_builddir)/kommander/executor/libinstance.la $(top_builddir)/kommander/widget/libkommanderwidget.la $(LIB_TDEFILE) $(LIB_KPARTS) $(LIB_TDEHTML)
kde_services_DATA = kommander_part.desktop
libkommander_part_la_SOURCES = kommander_part.cpp
noinst_HEADERS = kommander_part.h

@ -47,7 +47,7 @@
#define KABC_EXPORT KDE_EXPORT
#define TDESU_EXPORT KDE_EXPORT
#define KVCARD_EXPORT KDE_EXPORT
#define KRESOURCES_EXPORT KDE_EXPORT
#define TDERESOURCES_EXPORT KDE_EXPORT
#define KSTYLE_EXPORT KDE_EXPORT
#define TDEHTML_EXPORT KDE_EXPORT
#define KMDI_EXPORT KDE_EXPORT

@ -22,7 +22,7 @@ libtdefilereplacepart_la_SOURCES = tdefilereplacepart.cpp tdefilereplaceview.cpp
commandengine.cpp configurationclasses.cpp
libtdefilereplacepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP
libtdefilereplacepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEHTML)
libtdefilereplacepart_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) $(LIB_TDEHTML)
messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/tdefilereplace.pot

@ -13,8 +13,8 @@
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef KFILEREPLACE_H
#define KFILEREPLACE_H
#ifndef TDEFILEREPLACE_H
#define TDEFILEREPLACE_H
#include <tdeparts/mainwindow.h>

@ -14,8 +14,8 @@
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef KFILEREPLACEIFACE_H
#define KFILEREPLACEIFACE_H
#ifndef TDEFILEREPLACEIFACE_H
#define TDEFILEREPLACEIFACE_H
#include <dcopobject.h>
@ -27,4 +27,4 @@ k_dcop:
virtual void openURL(const TQString& url) = 0;
};
#endif // KFILEREPLACEIFACE_H
#endif // TDEFILEREPLACEIFACE_H

@ -18,8 +18,8 @@
* *
***************************************************************************/
#ifndef KFILEREPLACELIB_H
#define KFILEREPLACELIB_H
#ifndef TDEFILEREPLACELIB_H
#define TDEFILEREPLACELIB_H
// KDE
#include <klocale.h>
@ -62,4 +62,4 @@ class KFileReplaceLib
static void setIconForFileEntry(TQListViewItem* item, TQString path);
};
#endif // KFILEREPLACEFILELIB_H
#endif // TDEFILEREPLACEFILELIB_H

@ -12,8 +12,8 @@
//
//
#ifndef KFILEREPLACEPART_H
#define KFILEREPLACEPART_H
#ifndef TDEFILEREPLACEPART_H
#define TDEFILEREPLACEPART_H
// QT

@ -15,8 +15,8 @@
* *
***************************************************************************/
#ifndef KFILEREPLACEVIEW_H
#define KFILEREPLACEVIEW_H
#ifndef TDEFILEREPLACEVIEW_H
#define TDEFILEREPLACEVIEW_H
#ifdef HAVE_CONFIG_H
#include <config.h>
@ -114,4 +114,4 @@ class KFileReplaceView : public KFileReplaceViewWdg
void searchingOnlyMode(bool);*/
};
#endif // KFILEREPLACEVIEW_H
#endif // TDEFILEREPLACEVIEW_H

Loading…
Cancel
Save