diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:16:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:16:20 -0600 |
| commit | dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5 (patch) | |
| tree | 4ebcd3dac0133d8d3fa880bbf83692c305b7350d /kcontrol/iccconfig | |
| parent | 1a9478c6e1b77b05814af8fa02cd563a5da8946b (diff) | |
| download | tdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.tar.gz tdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/iccconfig')
| -rw-r--r-- | kcontrol/iccconfig/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kcontrol/iccconfig/Makefile.am | 2 | ||||
| -rw-r--r-- | kcontrol/iccconfig/iccconfig.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kcontrol/iccconfig/CMakeLists.txt b/kcontrol/iccconfig/CMakeLists.txt index 74f4c6c5c..de5a8905a 100644 --- a/kcontrol/iccconfig/CMakeLists.txt +++ b/kcontrol/iccconfig/CMakeLists.txt @@ -33,6 +33,6 @@ set_source_files_properties( iccconfig.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDI tde_add_kpart( kcm_iccconfig AUTOMOC SOURCES iccconfig.cpp iccconfigbase.ui iccconfig.skel - LINK kio-shared krandr-shared + LINK kio-shared tderandr-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/iccconfig/Makefile.am b/kcontrol/iccconfig/Makefile.am index 9d8aec569..098e5aae1 100644 --- a/kcontrol/iccconfig/Makefile.am +++ b/kcontrol/iccconfig/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_iccconfig.la kcm_iccconfig_la_SOURCES = iccconfig.cpp iccconfigbase.ui iccconfig.skel -kcm_iccconfig_la_LDFLAGS = $(all_libraries) -lkrandr -module -avoid-version -no-undefined +kcm_iccconfig_la_LDFLAGS = $(all_libraries) -ltderandr -module -avoid-version -no-undefined kcm_iccconfig_la_LIBADD = -ltdeui $(LIB_KIO) $(LIB_XRANDR) diff --git a/kcontrol/iccconfig/iccconfig.h b/kcontrol/iccconfig/iccconfig.h index 74fe1b49d..1f8408e8f 100644 --- a/kcontrol/iccconfig/iccconfig.h +++ b/kcontrol/iccconfig/iccconfig.h @@ -27,7 +27,7 @@ #include <dcopobject.h> -#include <libkrandr/libkrandr.h> +#include <libtderandr/libtderandr.h> #include "iccconfigbase.h" |