diff options
| m--------- | admin | 0 | ||||
| -rw-r--r-- | kcontrol/background/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kcontrol/background/Makefile.am | 2 | ||||
| -rw-r--r-- | kcontrol/tdm/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kcontrol/tdm/Makefile.am | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/admin b/admin -Subproject 4813f61a33c80294b915d2c346916fa7013e04a +Subproject 92ee091d6ecb323af421834d2926f2d920035ad diff --git a/kcontrol/background/CMakeLists.txt b/kcontrol/background/CMakeLists.txt index 0d04bd10d..2dfc7ba3f 100644 --- a/kcontrol/background/CMakeLists.txt +++ b/kcontrol/background/CMakeLists.txt @@ -49,7 +49,7 @@ if( BUILD_KCONTROL ) 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 c64cdc5c1..9c6990d17 100644 --- a/kcontrol/background/Makefile.am +++ b/kcontrol/background/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_background.la 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 d325f8287..7c2a1f887 100644 --- a/kcontrol/tdm/CMakeLists.txt +++ b/kcontrol/tdm/CMakeLists.txt @@ -36,6 +36,6 @@ tde_add_kpart( kcm_tdm AUTOMOC 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 ae0e6a99e..3c8feeb96 100644 --- a/kcontrol/tdm/Makefile.am +++ b/kcontrol/tdm/Makefile.am @@ -5,7 +5,7 @@ kcm_tdm_la_SOURCES = background.cpp tdm-appear.cpp tdm-font.cpp tdm-shut.cpp \ 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 \ |