From 53fcddb43f8d3ff91fd9d964b338c9f9a8b0dbae Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Tue, 3 Apr 2007 07:01:23 +0000
Subject: [PATCH] link

svn path=/trunk/KDE/kdebase/workspace/; revision=649768
---
 kcmkwin/kwinrules/CMakeLists.txt | 57 +++++---------------------------
 1 file changed, 9 insertions(+), 48 deletions(-)

diff --git a/kcmkwin/kwinrules/CMakeLists.txt b/kcmkwin/kwinrules/CMakeLists.txt
index 4b9c3e6893..ccc68b6c60 100644
--- a/kcmkwin/kwinrules/CMakeLists.txt
+++ b/kcmkwin/kwinrules/CMakeLists.txt
@@ -1,81 +1,42 @@
-include_directories(
-    ${CMAKE_SOURCE_DIR}/workspace/kwin/lib
-    ${CMAKE_SOURCE_DIR}/workspace/kwin/lib
-    ${CMAKE_BINARY_DIR}/workspace/kwin
-)
+include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  ${CMAKE_SOURCE_DIR}/workspace/kwin/lib  )
 
 ADD_DEFINITIONS(-DKCMRULES)
 ########### next target ###############
 
 set(kwinrules_SRCS ruleswidget.cpp ruleslist.cpp kwinsrc.cpp detectwidget.cpp)
-kde4_add_ui3_files(kwinrules_SRCS ruleswidgetbase.ui ruleslistbase.ui detectwidgetbase.ui editshortcutbase.ui )
+
+kde4_add_ui_files(kwinrules_SRCS ruleslistbase.ui detectwidgetbase.ui)
+kde4_add_ui3_files(kwinrules_SRCS ruleswidgetbase.ui editshortcutbase.ui )
 
 set(kwin_rules_dialog_KDEINIT_SRCS main.cpp ${kwinrules_SRCS})
 
-kde4_automoc(kwin_rules_dialog ${kwin_rules_dialog_KDEINIT_SRCS})
+kde4_automoc(${kwin_rules_dialog_KDEINIT_SRCS})
 
 kde4_add_kdeinit_executable( kwin_rules_dialog ${kwin_rules_dialog_KDEINIT_SRCS})
 
-target_link_libraries(kdeinit_kwin_rules_dialog  ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} )
+target_link_libraries(kdeinit_kwin_rules_dialog  ${KDE4_KDEUI_LIBS} ${QT_QT3SUPPORT_LIBRARY} )
 
 install(TARGETS kdeinit_kwin_rules_dialog  DESTINATION ${LIB_INSTALL_DIR} )
 
 target_link_libraries( kwin_rules_dialog kdeinit_kwin_rules_dialog )
-install(TARGETS kwin_rules_dialog DESTINATION bin)
+install(TARGETS kwin_rules_dialog DESTINATION ${BIN_INSTALL_DIR})
 
 ########### next target ###############
 
 set(kcm_kwinrules_PART_SRCS kcm.cpp ${kwinrules_SRCS})
 
-kde4_automoc(kcm_kwinrules ${kcm_kwinrules_PART_SRCS})
+kde4_automoc(${kcm_kwinrules_PART_SRCS})
 
 kde4_add_plugin(kcm_kwinrules ${kcm_kwinrules_PART_SRCS})
 
-kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_kwinrules )
 
-target_link_libraries(kcm_kwinrules  ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} )
+target_link_libraries(kcm_kwinrules  ${KDE4_KDEUI_LIBS} ${QT_QT3SUPPORT_LIBRARY})
 
 install(TARGETS kcm_kwinrules  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 
-########### next target ###############
-
-
 ########### install files ###############
 
 install( FILES kwinrules.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
 
 
-
-
-#original Makefile.am contents follow:
-
-#METASOURCES = AUTO
-#AM_CPPFLAGS = $(all_includes) -DKCMRULES
-#INCLUDES = -I$(top_srcdir)/workspace/kwin/lib
-#
-#bin_PROGRAMS =
-#lib_LTLIBRARIES =
-#kdeinit_LTLIBRARIES = kwin_rules_dialog.la
-#kde_module_LTLIBRARIES = kcm_kwinrules.la 
-#noinst_LTLIBRARIES = libkwinrules.la
-#
-#libkwinrules_la_SOURCES = ruleswidget.cpp ruleslist.cpp kwinsrc.cpp detectwidget.cpp \
-#        ruleswidgetbase.ui ruleslistbase.ui detectwidgetbase.ui editshortcutbase.ui
-#libkwinrules_la_LDFLAGS = $(all_libraries) -no-undefined
-#libkwinrules_la_LIBADD = $(LIB_KDEUI)
-#
-#kcm_kwinrules_la_SOURCES = kcm.cpp 
-#kcm_kwinrules_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
-#kcm_kwinrules_la_LIBADD = libkwinrules.la 
-#kcm_kwinrules_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h 
-#
-#kwin_rules_dialog_la_SOURCES = main.cpp 
-#kwin_rules_dialog_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
-#kwin_rules_dialog_la_LIBADD = libkwinrules.la 
-#kwin_rules_dialog_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h
-#
-#messages: rc.cpp
-#	$(XGETTEXT) *.cpp -o $(podir)/kcmkwinrules.pot
-#
-#xdg_apps_DATA = kwinrules.desktop