diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:08:27 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:08:27 -0600 |
| commit | f629c284059b75ab5b2d654e9a4132b1fc7f73e8 (patch) | |
| tree | 772f9eb968bcfc3b60d6a1b59e673700b246ef24 /katapult/katapult | |
| parent | 4946d97747eac03d3fbc7c624cd027990d85f0e4 (diff) | |
| download | katapult-f629c284059b75ab5b2d654e9a4132b1fc7f73e8.tar.gz katapult-f629c284059b75ab5b2d654e9a4132b1fc7f73e8.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'katapult/katapult')
| -rw-r--r-- | katapult/katapult/Makefile.am | 2 | ||||
| -rw-r--r-- | katapult/katapult/katapult.cpp | 2 | ||||
| -rw-r--r-- | katapult/katapult/katapultsettings.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/katapult/katapult/Makefile.am b/katapult/katapult/Makefile.am index af3f9c5..881d19d 100644 --- a/katapult/katapult/Makefile.am +++ b/katapult/katapult/Makefile.am @@ -16,7 +16,7 @@ bin_PROGRAMS = katapult # the application source, library search path, and link libraries katapult_SOURCES = confgeneral.ui confcatalogs.ui confdisplay.ui main.cpp \ katapult.cpp katapultsettings.cpp katapultconfigdlg.cpp katapultiface.skel -katapult_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +katapult_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor katapult_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la # this is where the desktop file will go diff --git a/katapult/katapult/katapult.cpp b/katapult/katapult/katapult.cpp index 660b8e9..1f5ae44 100644 --- a/katapult/katapult/katapult.cpp +++ b/katapult/katapult/katapult.cpp @@ -24,7 +24,7 @@ #include <twin.h> #include <kkeydialog.h> #include <kaction.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kpassivepopup.h> #include <kpopupmenu.h> #include <klocale.h> diff --git a/katapult/katapult/katapultsettings.cpp b/katapult/katapult/katapultsettings.cpp index b283ed0..522592c 100644 --- a/katapult/katapult/katapultsettings.cpp +++ b/katapult/katapult/katapultsettings.cpp @@ -23,7 +23,7 @@ #include <kapplication.h> #include <kconfig.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <klocale.h> #include <tqstring.h> |