6 files changed, 21 insertions, 45 deletions
diff --git a/samples/kcalc/CMakeLists.txt b/samples/kcalc/CMakeLists.txt
index 1a3c4ec5..8418baf6 100644
--- a/samples/kcalc/CMakeLists.txt
+++ b/samples/kcalc/CMakeLists.txt
@@ -30,33 +30,25 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
 ########### next target ###############
 
 SET(kcalc_KDEINIT_SRCS
-kcalc.cpp
-kcalc_button.cpp
-kcalc_const_button.cpp
-kcalc_const_menu.cpp
-kcalc_core.cpp
-kcalcdisplay.cpp
-dlabel.cpp
-stats.cpp
-)
+   kcalc.cpp
+   kcalc_button.cpp
+   kcalc_const_button.cpp
+   kcalc_const_menu.cpp
+   kcalc_core.cpp
+   kcalcdisplay.cpp
+   dlabel.cpp
+   stats.cpp
+   )
 
 KDE3_AUTOMOC(${kcalc_KDEINIT_SRCS})
 
-SET( kcalc_UI
-colors.ui
-general.ui
-constants.ui
-)
+SET( kcalc_UI colors.ui general.ui constants.ui )
 
 KDE3_ADD_UI_FILES(kcalc_KDEINIT_SRCS ${kcalc_UI} )
 
-SET( kcalc_KCFG_SRCS
-kcalc_settings.kcfgc
-)
+KDE3_ADD_KCFG_FILES(kcalc_KDEINIT_SRCS kcalc_settings.kcfgc )
 
-KDE3_ADD_KCFG_FILES(kcalc_KDEINIT_SRCS ${kcalc_KCFG_SRCS})
-
-KDE3_ADD_KLM( kcalc ${kcalc_KDEINIT_SRCS})
+KDE3_ADD_KDEINIT_EXECUTABLE( kcalc ${kcalc_KDEINIT_SRCS})
 
 # gmp, knumber and kdeui added manually
 TARGET_LINK_LIBRARIES(kdeinit_kcalc  ${QT_AND_KDECORE_LIBS} kdeui knumber gmp)
@@ -75,7 +67,6 @@ INSTALL_FILES( /share/apps/kconf_update FILES kcalcrc.upd )
 
 KDE3_INSTALL_ICONS( hicolor )
 
-KDE3_PLACEHOLDER()
 
 
 
diff --git a/samples/kcalc/knumber/CMakeLists.txt b/samples/kcalc/knumber/CMakeLists.txt
index 77042474..5be3ca14 100644
--- a/samples/kcalc/knumber/CMakeLists.txt
+++ b/samples/kcalc/knumber/CMakeLists.txt
@@ -8,10 +8,7 @@ ADD_DEFINITIONS(-D_GNU_SOURCE -D_ISOC99_SOURCE ) # added manually
 
 ########### next target ###############
 
-SET(knumber_STAT_SRCS
-knumber.cpp
-knumber_priv.cpp
-)
+SET(knumber_STAT_SRCS knumber.cpp knumber_priv.cpp )
 
 KDE3_AUTOMOC(${knumber_STAT_SRCS})
 
@@ -21,8 +18,6 @@ ADD_LIBRARY(knumber STATIC ${knumber_STAT_SRCS})
 ########### install files ###############
 
 
-KDE3_PLACEHOLDER()
-
 
 
 #original Makefile.am contents follow:
diff --git a/samples/kcalc/knumber/tests/CMakeLists.txt b/samples/kcalc/knumber/tests/CMakeLists.txt
index 243de913..72a55b6d 100644
--- a/samples/kcalc/knumber/tests/CMakeLists.txt
+++ b/samples/kcalc/knumber/tests/CMakeLists.txt
@@ -3,9 +3,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/kcalc/knumber ${KDE3_INCLUDE_DIR} ${QT_
 
 ########### next target ###############
 
-SET(knumbertest_SRCS
-knumbertest.cpp
-)
+SET(knumbertest_SRCS knumbertest.cpp )
 
 KDE3_AUTOMOC(${knumbertest_SRCS})
 
@@ -19,8 +17,6 @@ ENDIF(KDE3_BUILD_TESTS)
 ########### install files ###############
 
 
-KDE3_PLACEHOLDER()
-
 
 
 #original Makefile.am contents follow:
diff --git a/samples/kpager/CMakeLists.txt b/samples/kpager/CMakeLists.txt
index bd53d10f..1033af75 100644
--- a/samples/kpager/CMakeLists.txt
+++ b/samples/kpager/CMakeLists.txt
@@ -12,18 +12,16 @@ INCLUDE_DIRECTORIES( ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${CMAKE_CURRENT_SOURC
 ########### next target ###############
 
 SET(kpager_SRCS
-desktop.cpp
-kpager.cpp
-config.cpp
-windowdrag.cpp
-main.cpp
-)
+   desktop.cpp
+   kpager.cpp
+   config.cpp
+   windowdrag.cpp
+   main.cpp
+   )
 
 KDE3_AUTOMOC(${kpager_SRCS})
 
-SET( kpager_DCOP_SKEL_SRCS
-kpagerIface.h
-)
+SET( kpager_DCOP_SKEL_SRCS kpagerIface.h )
 
 KDE3_ADD_DCOP_SKELS(kpager_SRCS ${kpager_DCOP_SKEL_SRCS})
 
@@ -40,8 +38,6 @@ INSTALL_FILES( /share/applications/kde FILES kpager.desktop )
 
 KDE3_INSTALL_ICONS( hicolor )
 
-KDE3_PLACEHOLDER()
-
 
 
 #original Makefile.am contents follow:
diff --git a/samples/man/CMakeLists.txt b/samples/man/CMakeLists.txt
index 76c92579..7ea0c537 100644
--- a/samples/man/CMakeLists.txt
+++ b/samples/man/CMakeLists.txt
@@ -84,7 +84,6 @@ INSTALL_TARGETS(/lib/kde3 kmanpart )
 INSTALL_FILES( /share/apps/kio_man FILES kio_man.css )
 INSTALL_FILES( /share/services FILES man.protocol kmanpart.desktop )
 
-KDE3_PLACEHOLDER()
 
 
 
diff --git a/samples/view1394/CMakeLists.txt b/samples/view1394/CMakeLists.txt
index 6e4545f1..56d0d34d 100644
--- a/samples/view1394/CMakeLists.txt
+++ b/samples/view1394/CMakeLists.txt
@@ -37,7 +37,6 @@ INSTALL_TARGETS(/lib/kde3 kcm_view1394 )
 INSTALL_FILES( /share/applications/kde FILES kcmview1394.desktop )
 INSTALL_FILES( /share/apps/kcmview1394 FILES oui.db )
 
-KDE3_PLACEHOLDER()