diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:12:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:12:20 -0600 |
| commit | dbd03a35639ec4ea5ecbf580f9e84c224989531a (patch) | |
| tree | 7f4c35d46663b2336a26d4a32ced2601a59b6f00 /ksystemlog | |
| parent | af170e7e3fc1491de418039e06d5a8bd12ea352a (diff) | |
| download | ksystemlog-dbd03a35639ec4ea5ecbf580f9e84c224989531a.tar.gz ksystemlog-dbd03a35639ec4ea5ecbf580f9e84c224989531a.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'ksystemlog')
| -rw-r--r-- | ksystemlog/doc/Makefile | 8 | ||||
| -rw-r--r-- | ksystemlog/doc/en/Makefile | 8 | ||||
| -rw-r--r-- | ksystemlog/po/Makefile | 8 | ||||
| -rw-r--r-- | ksystemlog/src/Makefile.am | 2 | ||||
| -rw-r--r-- | ksystemlog/src/view.h | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/ksystemlog/doc/Makefile b/ksystemlog/doc/Makefile index 41a7627..62cd49d 100644 --- a/ksystemlog/doc/Makefile +++ b/ksystemlog/doc/Makefile @@ -126,12 +126,12 @@ LIB_TDEPRINT = -ltdeprint LIB_TDEUI = -ltdeui LIB_KFILE = -lkio LIB_KFM = -LIB_KHTML = -lkhtml +LIB_KHTML = -ltdehtml LIB_KIO = -lkio -LIB_KPARTS = -lkparts -LIB_KSPELL = -lkspell +LIB_KPARTS = -ltdeparts +LIB_KSPELL = -ltdespell LIB_KSYCOCA = -lkio -LIB_KUTILS = -lkutils +LIB_KUTILS = -ltdeutils LIB_POLL = LIB_QPE = LIB_QT = -lqt-mt $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread diff --git a/ksystemlog/doc/en/Makefile b/ksystemlog/doc/en/Makefile index 7c1a0db..5400834 100644 --- a/ksystemlog/doc/en/Makefile +++ b/ksystemlog/doc/en/Makefile @@ -123,12 +123,12 @@ LIB_TDEPRINT = -ltdeprint LIB_TDEUI = -ltdeui LIB_KFILE = -lkio LIB_KFM = -LIB_KHTML = -lkhtml +LIB_KHTML = -ltdehtml LIB_KIO = -lkio -LIB_KPARTS = -lkparts -LIB_KSPELL = -lkspell +LIB_KPARTS = -ltdeparts +LIB_KSPELL = -ltdespell LIB_KSYCOCA = -lkio -LIB_KUTILS = -lkutils +LIB_KUTILS = -ltdeutils LIB_POLL = LIB_QPE = LIB_QT = -lqt-mt $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread diff --git a/ksystemlog/po/Makefile b/ksystemlog/po/Makefile index cd8e461..9ca6b6e 100644 --- a/ksystemlog/po/Makefile +++ b/ksystemlog/po/Makefile @@ -123,12 +123,12 @@ LIB_TDEPRINT = -ltdeprint LIB_TDEUI = -ltdeui LIB_KFILE = -lkio LIB_KFM = -LIB_KHTML = -lkhtml +LIB_KHTML = -ltdehtml LIB_KIO = -lkio -LIB_KPARTS = -lkparts -LIB_KSPELL = -lkspell +LIB_KPARTS = -ltdeparts +LIB_KSPELL = -ltdespell LIB_KSYCOCA = -lkio -LIB_KUTILS = -lkutils +LIB_KUTILS = -ltdeutils LIB_POLL = LIB_QPE = LIB_QT = -lqt-mt $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread diff --git a/ksystemlog/src/Makefile.am b/ksystemlog/src/Makefile.am index c0588e3..c0bbdc3 100644 --- a/ksystemlog/src/Makefile.am +++ b/ksystemlog/src/Makefile.am @@ -14,7 +14,7 @@ INCLUDES = -I$(top_srcdir)/ksystemlog/src -I$(top_builddir)/ksystemlog/src/ -I$(top_srcdir)/ksystemlog/src/system -I$(top_srcdir)/ksystemlog/src/xorg $(all_includes) # the library search path. -ksystemlog_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkutils +ksystemlog_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdeutils # the libraries to link against. ksystemlog_LDADD = \ diff --git a/ksystemlog/src/view.h b/ksystemlog/src/view.h index 82da7e8..50cd8af 100644 --- a/ksystemlog/src/view.h +++ b/ksystemlog/src/view.h @@ -42,7 +42,7 @@ #include <kconfig.h> #include <ksystemlogiface.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "globals.h" #include "logListItem.h" |