diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:59 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:59 -0600 |
| commit | 1515a4f2eb9cf023ed7f9c2e10106b5e93164a08 (patch) | |
| tree | d5617734090b254659ff331ce7d1e574c4807caf /kbabel/catalogmanager | |
| parent | f8069e2ea048f2657cc417d83820576ec55c181b (diff) | |
| download | tdesdk-1515a4f2eb9cf023ed7f9c2e10106b5e93164a08.tar.gz tdesdk-1515a4f2eb9cf023ed7f9c2e10106b5e93164a08.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kbabel/catalogmanager')
| -rw-r--r-- | kbabel/catalogmanager/Makefile.am | 4 | ||||
| -rw-r--r-- | kbabel/catalogmanager/markpatterndialog.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kbabel/catalogmanager/Makefile.am b/kbabel/catalogmanager/Makefile.am index f33f29f9..5f88bf70 100644 --- a/kbabel/catalogmanager/Makefile.am +++ b/kbabel/catalogmanager/Makefile.am @@ -27,14 +27,14 @@ libcatalogmanager_la_SOURCES = catalogmanageriface.skel \ libcatalogmanager_la_LIBADD = ../commonui/libkbabelcommonui.la \ ../kbabeldict/libkbabeldict.la ./libcvs/libcatalogmanagercvs.la \ ./libsvn/libcatalogmanagersvn.la $(LIB_KIO) -libcatalogmanager_la_LDFLAGS = $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) +libcatalogmanager_la_LDFLAGS = $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS) catalogmanager_SOURCES = main.cpp # the libraries to link against. catalogmanager_LDADD = libcatalogmanager.la -catalogmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) +catalogmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS) # these are the headers for your project noinst_HEADERS = catalogmanageriface.h catalogmanager.h \ diff --git a/kbabel/catalogmanager/markpatterndialog.cpp b/kbabel/catalogmanager/markpatterndialog.cpp index 458611ab..21e5eadc 100644 --- a/kbabel/catalogmanager/markpatterndialog.cpp +++ b/kbabel/catalogmanager/markpatterndialog.cpp @@ -41,7 +41,7 @@ #include <kconfig.h> #include <kglobal.h> #include <klocale.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kregexpeditorinterface.h> #include "markpatterndialog.h" |