diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:46 -0600 |
| commit | 48087e1d5650499b6093a6816356d467c8461802 (patch) | |
| tree | 00c39f978492596620df1374e8a91af507d8bac3 /krfb | |
| parent | ccfaeb9b831a41e93e777b041cdf33a7d40a0e0b (diff) | |
| download | tdenetwork-48087e1d5650499b6093a6816356d467c8461802.tar.gz tdenetwork-48087e1d5650499b6093a6816356d467c8461802.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'krfb')
| -rw-r--r-- | krfb/kcm_krfb/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | krfb/kcm_krfb/Makefile.am | 2 | ||||
| -rw-r--r-- | krfb/kinetd/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/krfb/kcm_krfb/CMakeLists.txt b/krfb/kcm_krfb/CMakeLists.txt index 4edb8d82..4f7e0b95 100644 --- a/krfb/kcm_krfb/CMakeLists.txt +++ b/krfb/kcm_krfb/CMakeLists.txt @@ -30,6 +30,6 @@ install( FILES kcmkrfb.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_krfb AUTOMOC SOURCES configurationwidget.ui kcm_krfb.cpp - LINK krfbconfig-static srvloc-static kdnssd-shared kio-shared + LINK krfbconfig-static srvloc-static tdednssd-shared kio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/krfb/kcm_krfb/Makefile.am b/krfb/kcm_krfb/Makefile.am index b8f90547..a077da21 100644 --- a/krfb/kcm_krfb/Makefile.am +++ b/krfb/kcm_krfb/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = kcm_krfb.la kcm_krfb_la_SOURCES = configurationwidget.ui kcm_krfb.cpp -kcm_krfb_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kcm_krfb_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kcm_krfb_la_LIBADD = ../krfb/libkrfbconfig.la $(LIB_TDEUI) -lkio # Services diff --git a/krfb/kinetd/CMakeLists.txt b/krfb/kinetd/CMakeLists.txt index bad2d690..12de75e5 100644 --- a/krfb/kinetd/CMakeLists.txt +++ b/krfb/kinetd/CMakeLists.txt @@ -33,6 +33,6 @@ install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/kinetd ) tde_add_kpart( kded_kinetd AUTOMOC SOURCES kinetd.cpp kinetd.skel LINK - srvloc-static kdnssd-shared tdeinit_kded-shared + srvloc-static tdednssd-shared tdeinit_kded-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) |