07d87c94 | 2014-09-24 12:11:24 | Slávek Banko |
Fix remaining renaming knewstuff |
||
M admin M kcontrol/background/CMakeLists.txt M kcontrol/background/Makefile.am M kcontrol/tdm/CMakeLists.txt M kcontrol/tdm/Makefile.am |
||
diff --git a/admin b/admin index 4813f61..92ee091 160000 --- a/admin +++ b/admin -Subproject commit 4813f61a33c80294b915d2c346916fa7013e04a7 +Subproject commit 92ee091d6ecb323af421834d2926f2d920035adc diff --git a/kcontrol/background/CMakeLists.txt b/kcontrol/background/CMakeLists.txt index 0d04bd1..2dfc7ba 100644 --- a/kcontrol/background/CMakeLists.txt +++ b/kcontrol/background/CMakeLists.txt @@ -49,7 +49,7 @@ tde_add_kpart( kcm_background AUTOMOC SOURCES main.cpp - LINK kcmbgnd-static bgnd-static knewstuff-shared + LINK kcmbgnd-static bgnd-static tdenewstuff-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/background/Makefile.am b/kcontrol/background/Makefile.am index c64cdc5..9c6990d 100644 --- a/kcontrol/background/Makefile.am +++ b/kcontrol/background/Makefile.am @@ -6,7 +6,7 @@ kcm_background_la_SOURCES = main.cpp kcm_background_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined -kcm_background_la_LIBADD = libkcmbgnd.la libbgnd.la $(LIB_TDEFILE) $(LIB_KNEWSTUFF) +kcm_background_la_LIBADD = libkcmbgnd.la libbgnd.la $(LIB_TDEFILE) $(LIB_TDENEWSTUFF) METASOURCES = AUTO diff --git a/kcontrol/tdm/CMakeLists.txt b/kcontrol/tdm/CMakeLists.txt index d325f82..7c2a1f8 100644 --- a/kcontrol/tdm/CMakeLists.txt +++ b/kcontrol/tdm/CMakeLists.txt @@ -36,6 +36,6 @@ SOURCES background.cpp tdm-appear.cpp tdm-font.cpp tdm-shut.cpp tdm-users.cpp tdm-conv.cpp main.cpp kbackedcombobox.cpp - LINK kcmbgnd-static bgnd-static knewstuff-shared + LINK kcmbgnd-static bgnd-static tdenewstuff-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/tdm/Makefile.am b/kcontrol/tdm/Makefile.am index ae0e6a9..3c8feeb 100644 --- a/kcontrol/tdm/Makefile.am +++ b/kcontrol/tdm/Makefile.am @@ -5,7 +5,7 @@ tdm-users.cpp tdm-conv.cpp main.cpp kbackedcombobox.cpp kcm_tdm_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -kcm_tdm_la_LIBADD = $(top_builddir)/kcontrol/background/libkcmbgnd.la $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_TDEIO) $(LIB_KNEWSTUFF) +kcm_tdm_la_LIBADD = $(top_builddir)/kcontrol/background/libkcmbgnd.la $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_TDEIO) $(LIB_TDENEWSTUFF) AM_CPPFLAGS= -I$(top_builddir)/kcontrol/background \ -I$(top_srcdir)/kcontrol/background \ |