diff --git a/clients/b2/config/CMakeLists.txt b/clients/b2/config/CMakeLists.txt
index f9a0945242..ec294fa6e5 100644
--- a/clients/b2/config/CMakeLists.txt
+++ b/clients/b2/config/CMakeLists.txt
@@ -5,11 +5,12 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )
 
 set(kwin_b2_config_PART_SRCS config.cpp )
 
-kde4_automoc(${kwin_b2_config_PART_SRCS})
+kde4_automoc(kwin_b2_config ${kwin_b2_config_PART_SRCS})
 
 kde4_add_plugin(kwin_b2_config ${kwin_b2_config_PART_SRCS})
 
 
+
 target_link_libraries(kwin_b2_config  ${KDE4_KDEUI_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${QT_QTGUI_LIBRARY})
 
 install(TARGETS kwin_b2_config  DESTINATION ${PLUGIN_INSTALL_DIR} )
@@ -18,3 +19,25 @@ install(TARGETS kwin_b2_config  DESTINATION ${PLUGIN_INSTALL_DIR} )
 ########### install files ###############
 
 install( FILES   DESTINATION  ${DATA_INSTALL_DIR}/kwin/ )
+
+
+
+
+#original Makefile.am contents follow:
+
+#INCLUDES = $(all_includes)
+#
+#kde_module_LTLIBRARIES = kwin_b2_config.la
+#
+#kwin_b2_config_la_SOURCES = config.cpp
+#kwin_b2_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+#kwin_b2_config_la_LIBADD = $(LIB_KDEUI)
+#
+#METASOURCES = AUTO
+#noinst_HEADERS = config.h
+#
+#lnkdir = $(kde_datadir)/kwin/
+#
+####KMAKE-start (don't edit or delete this block)
+#
+####KMAKE-end
diff --git a/clients/default/CMakeLists.txt b/clients/default/CMakeLists.txt
index 4286b7ea7c..9632a9227c 100644
--- a/clients/default/CMakeLists.txt
+++ b/clients/default/CMakeLists.txt
@@ -5,13 +5,38 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )
 
 ########### next target ###############
 
-set(kwin3_default_PART_SRCS kdedefault.cpp)
+set(kwin3_default_PART_SRCS kdedefault.cpp )
 
-kde4_automoc(${kwin3_default_PART_SRCS})
+kde4_automoc(kwin3_default ${kwin3_default_PART_SRCS})
 
 kde4_add_plugin(kwin3_default ${kwin3_default_PART_SRCS})
 
 
-target_link_libraries(kwin3_default ${KDE4_KDEFX_LIBS} kdecorations ${QT_QTGUI_LIBRARY})
 
-install(TARGETS kwin3_default  DESTINATION ${PLUGIN_INSTALL_DIR})
+target_link_libraries(kwin3_default  ${KDE4_KDECORE_LIBS} kdefx kdecorations ${QT_QTGUI_LIBRARY})
+
+install(TARGETS kwin3_default  DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+
+########### install files ###############
+
+
+
+
+
+#original Makefile.am contents follow:
+
+#
+#INCLUDES = -I$(srcdir)/../../lib $(all_includes)
+#
+#SUBDIRS = . config
+#
+#kde_module_LTLIBRARIES = kwin3_default.la
+#
+#kwin3_default_la_SOURCES = kdedefault.cpp
+#kwin3_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+#kwin3_default_la_LIBADD  = $(LIB_KDECORE) -lkdefx ../../lib/libkdecorations.la
+#
+#METASOURCES = AUTO
+#noinst_HEADERS = kdedefault.h
+#
diff --git a/clients/default/config/CMakeLists.txt b/clients/default/config/CMakeLists.txt
index cf195dfe72..80d10d2102 100644
--- a/clients/default/config/CMakeLists.txt
+++ b/clients/default/config/CMakeLists.txt
@@ -5,11 +5,12 @@
 
 set(kwin_default_config_PART_SRCS config.cpp )
 
-kde4_automoc(${kwin_default_config_PART_SRCS})
+kde4_automoc(kwin_default_config ${kwin_default_config_PART_SRCS})
 
 kde4_add_plugin(kwin_default_config ${kwin_default_config_PART_SRCS})
 
 
+
 target_link_libraries(kwin_default_config  ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY})
 
 install(TARGETS kwin_default_config  DESTINATION ${PLUGIN_INSTALL_DIR} )
@@ -18,3 +19,25 @@ install(TARGETS kwin_default_config  DESTINATION ${PLUGIN_INSTALL_DIR} )
 ########### install files ###############
 
 install( FILES   DESTINATION  ${DATA_INSTALL_DIR}/kwin/ )
+
+
+
+
+#original Makefile.am contents follow:
+
+#INCLUDES = $(all_includes)
+#
+#kde_module_LTLIBRARIES = kwin_default_config.la
+#
+#kwin_default_config_la_SOURCES = config.cpp
+#kwin_default_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+#kwin_default_config_la_LIBADD = $(LIB_KDEUI)
+#
+#METASOURCES = AUTO
+#noinst_HEADERS = config.h
+#
+#lnkdir = $(kde_datadir)/kwin/
+#
+####KMAKE-start (don't edit or delete this block)
+#
+####KMAKE-end
diff --git a/clients/keramik/CMakeLists.txt b/clients/keramik/CMakeLists.txt
index 21398dfea1..e4c8ec323c 100644
--- a/clients/keramik/CMakeLists.txt
+++ b/clients/keramik/CMakeLists.txt
@@ -8,13 +8,14 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )
 
 set(kwin3_keramik_PART_SRCS keramik.cpp )
 
-kde4_automoc(${kwin3_keramik_PART_SRCS})
+kde4_automoc(kwin3_keramik ${kwin3_keramik_PART_SRCS})
 
 qt4_add_resources(kwin3_keramik_PART_SRCS tiles.qrc )
 
 kde4_add_plugin(kwin3_keramik ${kwin3_keramik_PART_SRCS})
 
 
+
 target_link_libraries(kwin3_keramik  ${KDE4_KDEUI_LIBS} kdecorations ${QT_QT3SUPPORT_LIBRARY} ${QT_QTGUI_LIBRARY})
 
 install(TARGETS kwin3_keramik  DESTINATION ${PLUGIN_INSTALL_DIR} )
@@ -24,3 +25,28 @@ install(TARGETS kwin3_keramik  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 install( FILES keramik.desktop  DESTINATION  ${DATA_INSTALL_DIR}/kwin )
 
+
+
+
+#original Makefile.am contents follow:
+
+#INCLUDES                  = -I$(srcdir)/../../lib $(all_includes)
+#
+#SUBDIRS                   = . config
+#
+#kde_module_LTLIBRARIES    = kwin3_keramik.la
+#
+#kwin3_keramik_la_SOURCES   = keramik.cpp tiles.qrc
+#kwin3_keramik_la_LDFLAGS   = $(all_libraries) $(KDE_PLUGIN) -module
+#kwin3_keramik_la_LIBADD    = $(LIB_KDEUI) ../../lib/libkdecorations.la
+##kwin3_keramik_la_LDFLAGS   = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
+#
+#METASOURCES               = AUTO
+#noinst_headers        	  = keramik.h
+#
+#lnkdir                    = $(kde_datadir)/kwin
+#lnk_DATA                  = keramik.desktop
+#
+#EXTRA_DIST                = $(lnk_DATA)
+#
+#
diff --git a/clients/keramik/config/CMakeLists.txt b/clients/keramik/config/CMakeLists.txt
index 7db4362dbc..4108869eae 100644
--- a/clients/keramik/config/CMakeLists.txt
+++ b/clients/keramik/config/CMakeLists.txt
@@ -5,14 +5,38 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )
 
 set(kwin_keramik_config_PART_SRCS config.cpp )
 
-kde4_automoc(${kwin_keramik_config_PART_SRCS})
+kde4_automoc(kwin_keramik_config ${kwin_keramik_config_PART_SRCS})
 
-kde4_add_ui_files(kwin_keramik_config_PART_SRCS keramikconfig.ui )
+kde4_add_ui3_files(kwin_keramik_config_PART_SRCS keramikconfig.ui )
 
 kde4_add_plugin(kwin_keramik_config ${kwin_keramik_config_PART_SRCS})
 
 
+
 target_link_libraries(kwin_keramik_config  ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY})
 
 install(TARGETS kwin_keramik_config  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
+
+########### install files ###############
+
+install( FILES   DESTINATION  ${DATA_INSTALL_DIR}/kwin )
+
+
+
+
+#original Makefile.am contents follow:
+
+#INCLUDES                       = $(all_includes)
+#
+#kde_module_LTLIBRARIES         = kwin_keramik_config.la
+#
+#kwin_keramik_config_la_SOURCES = config.cpp keramikconfig.ui
+#kwin_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+#kwin_keramik_config_la_LIBADD  = $(LIB_KDEUI)
+#
+#METASOURCES                    = AUTO
+#noinst_HEADERS                 = config.h keramikconfig.h
+#
+#lnkdir                         = $(kde_datadir)/kwin
+#
diff --git a/clients/kwmtheme/CMakeLists.txt b/clients/kwmtheme/CMakeLists.txt
index ad5786ab9e..664ea73ffd 100644
--- a/clients/kwmtheme/CMakeLists.txt
+++ b/clients/kwmtheme/CMakeLists.txt
@@ -8,11 +8,12 @@ add_subdirectory( cli_installer )
 
 set(kwin3_kwmtheme_PART_SRCS kwmthemeclient.cpp )
 
-kde4_automoc(${kwin3_kwmtheme_PART_SRCS})
+kde4_automoc(kwin3_kwmtheme ${kwin3_kwmtheme_PART_SRCS})
 
 kde4_add_plugin(kwin3_kwmtheme ${kwin3_kwmtheme_PART_SRCS})
 
 
+
 target_link_libraries(kwin3_kwmtheme  ${KDE4_KDECORE_LIBS} kdecorations )
 
 install(TARGETS kwin3_kwmtheme  DESTINATION ${PLUGIN_INSTALL_DIR} )
@@ -23,3 +24,22 @@ install(TARGETS kwin3_kwmtheme  DESTINATION ${PLUGIN_INSTALL_DIR} )
 install( FILES kwmtheme.desktop  DESTINATION  ${DATA_INSTALL_DIR}/kwin )
 
 
+
+
+#original Makefile.am contents follow:
+
+#SUBDIRS=cli_installer
+#INCLUDES = $(all_includes) 
+#
+#kde_module_LTLIBRARIES = kwin3_kwmtheme.la
+#
+#kwin3_kwmtheme_la_SOURCES = kwmthemeclient.cpp
+#kwin3_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+#kwin3_kwmtheme_la_LIBADD  = -lkdecorations
+#
+#METASOURCES = AUTO
+#noinst_HEADERS = kwmthemeclient.h
+#
+#lnkdir = $(kde_datadir)/kwin
+#lnk_DATA = kwmtheme.desktop
+#
diff --git a/clients/laptop/CMakeLists.txt b/clients/laptop/CMakeLists.txt
index c64f0d66d4..8fdba8022e 100644
--- a/clients/laptop/CMakeLists.txt
+++ b/clients/laptop/CMakeLists.txt
@@ -4,19 +4,42 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )
 
 ########### next target ###############
 
-set(kwin3_laptop_PART_SRCS laptopclient.cpp)
+set(kwin3_laptop_PART_SRCS laptopclient.cpp )
 
-kde4_automoc(${kwin3_laptop_PART_SRCS})
+kde4_automoc(kwin3_laptop ${kwin3_laptop_PART_SRCS})
 
 kde4_add_plugin(kwin3_laptop ${kwin3_laptop_PART_SRCS})
 
 
-target_link_libraries(kwin3_laptop ${KDE4_KDEFX_LIBS} kdecorations)
 
-install(TARGETS kwin3_laptop  DESTINATION ${PLUGIN_INSTALL_DIR})
+target_link_libraries(kwin3_laptop  ${KDE4_KDECORE_LIBS} kdecorations kdefx )
+
+install(TARGETS kwin3_laptop  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 
 ########### install files ###############
 
 install( FILES laptop.desktop  DESTINATION  ${DATA_INSTALL_DIR}/kwin )
 
+
+
+
+#original Makefile.am contents follow:
+
+#
+#INCLUDES = -I$(srcdir)/../../lib $(all_includes)
+#
+#kde_module_LTLIBRARIES = kwin3_laptop.la
+#
+#kwin3_laptop_la_SOURCES = laptopclient.cpp
+#kwin3_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module 
+#kwin3_laptop_la_LIBADD  = ../../lib/libkdecorations.la -lkdefx
+#
+#METASOURCES = AUTO
+#noinst_HEADERS = laptopclient.h
+#
+#lnkdir = $(kde_datadir)/kwin
+#lnk_DATA = laptop.desktop
+#
+#EXTRA_DIST = $(lnk_DATA)
+#
diff --git a/clients/modernsystem/CMakeLists.txt b/clients/modernsystem/CMakeLists.txt
index dbb3957444..8ced143f3c 100644
--- a/clients/modernsystem/CMakeLists.txt
+++ b/clients/modernsystem/CMakeLists.txt
@@ -6,19 +6,44 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )
 
 ########### next target ###############
 
-set(kwin3_modernsys_PART_SRCS modernsys.cpp)
+set(kwin3_modernsys_PART_SRCS modernsys.cpp )
 
-kde4_automoc(${kwin3_modernsys_PART_SRCS})
+kde4_automoc(kwin3_modernsys ${kwin3_modernsys_PART_SRCS})
 
 kde4_add_plugin(kwin3_modernsys ${kwin3_modernsys_PART_SRCS})
 
 
-target_link_libraries(kwin3_modernsys ${KDE4_KDEFX_LIBS} kdecorations ${QT_QTGUI_LIBRARY})
 
-install(TARGETS kwin3_modernsys  DESTINATION ${PLUGIN_INSTALL_DIR})
+target_link_libraries(kwin3_modernsys  ${KDE4_KDECORE_LIBS} kdecorations kdefx ${QT_QTGUI_LIBRARY})
+
+install(TARGETS kwin3_modernsys  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 
 ########### install files ###############
 
 install( FILES modernsystem.desktop  DESTINATION  ${DATA_INSTALL_DIR}/kwin/ )
 
+
+
+
+#original Makefile.am contents follow:
+
+#
+#INCLUDES = -I$(srcdir)/../../lib $(all_includes)
+#
+#SUBDIRS = config
+#
+#kde_module_LTLIBRARIES = kwin3_modernsys.la
+#
+#kwin3_modernsys_la_SOURCES = modernsys.cpp
+#kwin3_modernsys_la_LIBADD = ../../lib/libkdecorations.la -lkdefx
+#kwin3_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+#
+#METASOURCES = AUTO
+#noinst_HEADERS = modernsys.h
+#
+#lnkdir = $(kde_datadir)/kwin/
+#lnk_DATA = modernsystem.desktop
+#
+#EXTRA_DIST = $(lnk_DATA)
+#
diff --git a/clients/modernsystem/config/CMakeLists.txt b/clients/modernsystem/config/CMakeLists.txt
index e2ba85e6c9..4327be7951 100644
--- a/clients/modernsystem/config/CMakeLists.txt
+++ b/clients/modernsystem/config/CMakeLists.txt
@@ -5,12 +5,37 @@
 
 set(kwin_modernsys_config_PART_SRCS config.cpp )
 
-kde4_automoc(${kwin_modernsys_config_PART_SRCS})
+kde4_automoc(kwin_modernsys_config ${kwin_modernsys_config_PART_SRCS})
 
 kde4_add_plugin(kwin_modernsys_config ${kwin_modernsys_config_PART_SRCS})
 
 
+
 target_link_libraries(kwin_modernsys_config  ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY}) 
 
 install(TARGETS kwin_modernsys_config  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
+
+########### install files ###############
+
+install( FILES   DESTINATION  ${DATA_INSTALL_DIR}/kwin/ )
+
+
+
+
+#original Makefile.am contents follow:
+
+#
+#INCLUDES = $(all_includes)
+#
+#kde_module_LTLIBRARIES = kwin_modernsys_config.la
+#
+#kwin_modernsys_config_la_SOURCES = config.cpp
+#kwin_modernsys_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+#kwin_modernsys_config_la_LIBADD = $(LIB_KDEUI)
+#
+#METASOURCES = AUTO
+#noinst_HEADERS = config.h
+#
+#lnkdir = $(kde_datadir)/kwin/
+#
diff --git a/clients/plastik/CMakeLists.txt b/clients/plastik/CMakeLists.txt
index 1b475a1010..bc1e8b8988 100644
--- a/clients/plastik/CMakeLists.txt
+++ b/clients/plastik/CMakeLists.txt
@@ -12,12 +12,13 @@ set(kwin3_plastik_PART_SRCS
    plastikbutton.cpp 
    misc.cpp )
 
-kde4_automoc(${kwin3_plastik_PART_SRCS})
+kde4_automoc(kwin3_plastik ${kwin3_plastik_PART_SRCS})
 
 kde4_add_plugin(kwin3_plastik ${kwin3_plastik_PART_SRCS})
 
 
-target_link_libraries(kwin3_plastik kdecorations ${KDE4_KDEFX_LIBS})
+
+target_link_libraries(kwin3_plastik  ${KDE4_KDEUI_LIBS} kdecorations kdefx)
 
 install(TARGETS kwin3_plastik  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
@@ -26,3 +27,27 @@ install(TARGETS kwin3_plastik  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 install( FILES plastik.desktop  DESTINATION  ${DATA_INSTALL_DIR}/kwin/ )
 
+
+
+
+#original Makefile.am contents follow:
+
+#AUTOMAKE_OPTIONS = foreign
+#
+#SUBDIRS = config
+#
+#KDE_CXXFLAGS = -DQT_PLUGIN
+#
+#INCLUDES = -I$(srcdir)/../../lib $(all_includes)
+#
+#kwindir = $(kde_datadir)/kwin/
+#kwin_DATA = plastik.desktop
+#
+#kde_module_LTLIBRARIES = kwin3_plastik.la
+#kwin3_plastik_la_SOURCES = plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp
+#kwin3_plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+#kwin3_plastik_la_LIBADD = $(LIB_KDEUI) ../../lib/libkdecorations.la
+#kwin3_plastik_la_METASOURCES = AUTO
+#
+#DISTCLEANFILES = $(kwin3_plastik_la_METASOURCES)
+#
diff --git a/clients/plastik/config/CMakeLists.txt b/clients/plastik/config/CMakeLists.txt
index 50904835f9..bf91680773 100644
--- a/clients/plastik/config/CMakeLists.txt
+++ b/clients/plastik/config/CMakeLists.txt
@@ -5,13 +5,39 @@
 
 set(kwin_plastik_config_PART_SRCS config.cpp )
 
-kde4_automoc(${kwin_plastik_config_PART_SRCS})
+kde4_automoc(kwin_plastik_config ${kwin_plastik_config_PART_SRCS})
 
-kde4_add_ui_files(kwin_plastik_config_PART_SRCS configdialog.ui )
+kde4_add_ui3_files(kwin_plastik_config_PART_SRCS configdialog.ui )
 
 kde4_add_plugin(kwin_plastik_config ${kwin_plastik_config_PART_SRCS})
 
 
+
 target_link_libraries(kwin_plastik_config  ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY})
 
 install(TARGETS kwin_plastik_config  DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+
+########### install files ###############
+
+install( FILES   DESTINATION  ${DATA_INSTALL_DIR}/kwin )
+
+
+
+
+#original Makefile.am contents follow:
+
+#INCLUDES                     = $(all_includes)
+#
+#kde_module_LTLIBRARIES       = kwin_plastik_config.la
+#
+#kwin_plastik_config_la_SOURCES = config.cpp configdialog.ui
+#kwin_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+#kwin_plastik_config_la_LIBADD  = $(LIB_KDEUI)
+#
+#METASOURCES                  = AUTO
+#noinst_HEADERS               = config.h
+#DISTCLEANFILES               = $(METASOURCES)
+#
+#lnkdir                       = $(kde_datadir)/kwin
+#
diff --git a/clients/quartz/CMakeLists.txt b/clients/quartz/CMakeLists.txt
index 14ba990409..7ca290298e 100644
--- a/clients/quartz/CMakeLists.txt
+++ b/clients/quartz/CMakeLists.txt
@@ -8,12 +8,13 @@ add_subdirectory( config )
 
 set(kwin3_quartz_PART_SRCS quartz.cpp )
 
-kde4_automoc(${kwin3_quartz_PART_SRCS})
+kde4_automoc(kwin3_quartz ${kwin3_quartz_PART_SRCS})
 
 kde4_add_plugin(kwin3_quartz ${kwin3_quartz_PART_SRCS})
 
 
-target_link_libraries(kwin3_quartz kdecorations ${KDE4_KDEFX_LIBS})
+
+target_link_libraries(kwin3_quartz  ${KDE4_KDEUI_LIBS} kdecorations kdefx)
 
 install(TARGETS kwin3_quartz  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
@@ -21,3 +22,32 @@ install(TARGETS kwin3_quartz  DESTINATION ${PLUGIN_INSTALL_DIR} )
 ########### install files ###############
 
 install( FILES quartz.desktop  DESTINATION  ${DATA_INSTALL_DIR}/kwin/ )
+
+
+
+
+#original Makefile.am contents follow:
+
+#
+#INCLUDES = -I$(srcdir)/../../lib $(all_includes)
+#
+#SUBDIRS = . config
+#
+#kde_module_LTLIBRARIES = kwin3_quartz.la
+#
+#kwin3_quartz_la_SOURCES = quartz.cpp
+#kwin3_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+#kwin3_quartz_la_LIBADD  = $(LIB_KDEUI)  ../../lib/libkdecorations.la
+#
+#METASOURCES = AUTO
+#noinst_HEADERS = quartz.h
+#
+#lnkdir = $(kde_datadir)/kwin/
+#lnk_DATA = quartz.desktop
+#
+#EXTRA_DIST = $(lnk_DATA)
+#
+#
+####KMAKE-start (don't edit or delete this block)
+#
+####KMAKE-end
diff --git a/clients/quartz/config/CMakeLists.txt b/clients/quartz/config/CMakeLists.txt
index 9165c594b4..51afa44dc7 100644
--- a/clients/quartz/config/CMakeLists.txt
+++ b/clients/quartz/config/CMakeLists.txt
@@ -5,11 +5,39 @@
 
 set(kwin_quartz_config_PART_SRCS config.cpp )
 
-kde4_automoc(${kwin_quartz_config_PART_SRCS})
+kde4_automoc(kwin_quartz_config ${kwin_quartz_config_PART_SRCS})
 
 kde4_add_plugin(kwin_quartz_config ${kwin_quartz_config_PART_SRCS})
 
 
+
 target_link_libraries(kwin_quartz_config  ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY})
 
 install(TARGETS kwin_quartz_config  DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+
+########### install files ###############
+
+install( FILES   DESTINATION  ${DATA_INSTALL_DIR}/kwin/ )
+
+
+
+
+#original Makefile.am contents follow:
+
+#INCLUDES = $(all_includes)
+#
+#kde_module_LTLIBRARIES = kwin_quartz_config.la
+#
+#kwin_quartz_config_la_SOURCES = config.cpp
+#kwin_quartz_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+#kwin_quartz_config_la_LIBADD = $(LIB_KDEUI)
+#
+#METASOURCES = AUTO
+#noinst_HEADERS = config.h
+#
+#lnkdir = $(kde_datadir)/kwin/
+#
+####KMAKE-start (don't edit or delete this block)
+#
+####KMAKE-end
diff --git a/clients/redmond/CMakeLists.txt b/clients/redmond/CMakeLists.txt
index da85acafaa..12f84c7930 100644
--- a/clients/redmond/CMakeLists.txt
+++ b/clients/redmond/CMakeLists.txt
@@ -5,16 +5,17 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )
 
 ########### next target ###############
 
-set(kwin3_redmond_PART_SRCS redmond.cpp)
+set(kwin3_redmond_PART_SRCS redmond.cpp )
 
-kde4_automoc(${kwin3_redmond_PART_SRCS})
+kde4_automoc(kwin3_redmond ${kwin3_redmond_PART_SRCS})
 
 kde4_add_plugin(kwin3_redmond ${kwin3_redmond_PART_SRCS})
 
 
-target_link_libraries(kwin3_redmond ${KDE4_KDEFX_LIBS} kdecorations)
 
-install(TARGETS kwin3_redmond  DESTINATION ${PLUGIN_INSTALL_DIR})
+target_link_libraries(kwin3_redmond  ${KDE4_KDECORE_LIBS} kdefx kdecorations )
+
+install(TARGETS kwin3_redmond  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 
 ########### install files ###############
@@ -22,3 +23,24 @@ install(TARGETS kwin3_redmond  DESTINATION ${PLUGIN_INSTALL_DIR})
 install( FILES redmond.desktop  DESTINATION  ${DATA_INSTALL_DIR}/kwin )
 
 
+
+
+#original Makefile.am contents follow:
+
+#
+#INCLUDES = -I$(srcdir)/../../lib $(all_includes)
+#
+#kde_module_LTLIBRARIES = kwin3_redmond.la
+#
+#kwin3_redmond_la_SOURCES = redmond.cpp
+#kwin3_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+#kwin3_redmond_la_LIBADD = $(LIB_KDECORE) -lkdefx ../../lib/libkdecorations.la
+#
+#METASOURCES = AUTO
+#noinst_HEADERS = redmond.h
+#
+#lnkdir = $(kde_datadir)/kwin
+#lnk_DATA = redmond.desktop
+#
+#EXTRA_DIST = $(lnk_DATA)
+#
diff --git a/clients/test/CMakeLists.txt b/clients/test/CMakeLists.txt
index a65ff23737..52ba33b579 100644
--- a/clients/test/CMakeLists.txt
+++ b/clients/test/CMakeLists.txt
@@ -6,11 +6,12 @@
 
 set(kwin3_test_PART_SRCS test.cpp )
 
-kde4_automoc(${kwin3_test_PART_SRCS})
+kde4_automoc(kwin3_test ${kwin3_test_PART_SRCS})
 
 kde4_add_plugin(kwin3_test ${kwin3_test_PART_SRCS})
 
 
+
 target_link_libraries(kwin3_test  ${KDE4_KDEUI_LIBS} kdecorations )
 
 install(TARGETS kwin3_test  DESTINATION ${PLUGIN_INSTALL_DIR} )
@@ -20,3 +21,23 @@ install(TARGETS kwin3_test  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 install( FILES test.desktop  DESTINATION  ${DATA_INSTALL_DIR}/kwin )
 
+
+
+
+#original Makefile.am contents follow:
+
+#INCLUDES                  = -I$(srcdir)/../../lib $(all_includes)
+#
+#kde_module_LTLIBRARIES    = kwin3_test.la
+#
+#kwin3_test_la_SOURCES   = test.cpp
+#kwin3_test_la_LDFLAGS   = $(all_libraries) $(KDE_PLUGIN) -module
+#kwin3_test_la_LIBADD    = $(LIB_KDEUI) ../../lib/libkdecorations.la
+##kwin_keramik_la_LDFLAGS   = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
+#
+#METASOURCES               = AUTO
+#
+#kwin_test_lnkdir                    = $(kde_datadir)/kwin
+#kwin_test_lnk_DATA                  = test.desktop
+#
+#EXTRA_DIST                = $(kwin_test_lnk_DATA)
diff --git a/clients/web/CMakeLists.txt b/clients/web/CMakeLists.txt
index b6b68febb4..3af623d66e 100644
--- a/clients/web/CMakeLists.txt
+++ b/clients/web/CMakeLists.txt
@@ -6,11 +6,12 @@
 
 set(kwin3_web_PART_SRCS Web.cpp WebButton.cpp )
 
-kde4_automoc(${kwin3_web_PART_SRCS})
+kde4_automoc(kwin3_web ${kwin3_web_PART_SRCS})
 
 kde4_add_plugin(kwin3_web ${kwin3_web_PART_SRCS})
 
 
+
 target_link_libraries(kwin3_web  ${KDE4_KDEUI_LIBS} kdecorations )
 
 install(TARGETS kwin3_web  DESTINATION ${PLUGIN_INSTALL_DIR} )
@@ -20,3 +21,23 @@ install(TARGETS kwin3_web  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 install( FILES web.desktop  DESTINATION  ${DATA_INSTALL_DIR}/kwin/ )
 
+
+
+
+#original Makefile.am contents follow:
+
+#INCLUDES                  = -I$(top_srcdir) $(all_includes)
+#kde_module_LTLIBRARIES    = kwin3_web.la
+#
+#kwin3_web_la_SOURCES      = Web.cpp WebButton.cpp
+#
+#noinst_HEADERS            = Web.h WebButton.h
+#
+#kwin3_web_la_LDFLAGS      = $(all_libraries) $(KDE_PLUGIN) -module
+#kwin3_web_la_LIBADD       = $(LIB_KDEUI) ../../lib/libkdecorations.la
+#METASOURCES               = AUTO
+#
+#linkdir                   = $(kde_datadir)/kwin/
+#link_DATA                 = web.desktop
+#EXTRA_DIST                = $(link_DATA)
+#
diff --git a/kcmkwin/kwindecoration/CMakeLists.txt b/kcmkwin/kwindecoration/CMakeLists.txt
index 4b31f54c2e..41ec038e43 100644
--- a/kcmkwin/kwindecoration/CMakeLists.txt
+++ b/kcmkwin/kwindecoration/CMakeLists.txt
@@ -10,7 +10,7 @@ kde4_automoc(kcm_kwindecoration ${kcm_kwindecoration_PART_SRCS})
 
 kde4_add_plugin(kcm_kwindecoration ${kcm_kwindecoration_PART_SRCS})
 
-kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_kwindecoration )
+
 
 target_link_libraries(kcm_kwindecoration  ${KDE4_KDEUI_LIBS} kdecorations ${QT_QT3SUPPORT_LIBRARY} ${X11_LIBRARIES})
 
diff --git a/kcmkwin/kwinoptions/CMakeLists.txt b/kcmkwin/kwinoptions/CMakeLists.txt
index 0df663ae4a..957105dc4f 100644
--- a/kcmkwin/kwinoptions/CMakeLists.txt
+++ b/kcmkwin/kwinoptions/CMakeLists.txt
@@ -9,7 +9,7 @@ kde4_automoc(kcm_kwinoptions ${kcm_kwinoptions_PART_SRCS})
 
 kde4_add_plugin(kcm_kwinoptions ${kcm_kwinoptions_PART_SRCS})
 
-kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_kwinoptions )
+
 
 target_link_libraries(kcm_kwinoptions  ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY})