From 4f5267e8f8a7a404b534f3d9c830406c27601794 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 30 Aug 2006 08:33:11 +0000 Subject: [PATCH] Clean up Use cmake macro Remove not necessary files svn path=/trunk/KDE/kdebase/workspace/; revision=578784 --- CMakeLists.txt | 38 ------------------- Makefile.am | 36 ------------------ clients/CMakeLists.txt | 17 --------- clients/Makefile.am | 4 -- clients/b2/CMakeLists.txt | 31 +-------------- clients/b2/config/CMakeLists.txt | 22 ----------- clients/b2/config/Makefile.am | 16 -------- clients/default/CMakeLists.txt | 26 +------------ clients/default/config/CMakeLists.txt | 22 ----------- clients/default/config/Makefile.am | 16 -------- clients/keramik/CMakeLists.txt | 25 ------------ clients/keramik/Makefile.am | 20 ---------- clients/keramik/config/CMakeLists.txt | 20 ---------- clients/keramik/config/Makefile.am | 13 ------- clients/kwmtheme/CMakeLists.txt | 19 ---------- clients/kwmtheme/Makefile.am | 15 -------- clients/kwmtheme/cli_installer/CMakeLists.txt | 27 ------------- clients/kwmtheme/cli_installer/Makefile.am | 18 --------- clients/laptop/CMakeLists.txt | 24 +----------- clients/laptop/Makefile.am | 17 --------- clients/modernsystem/CMakeLists.txt | 26 +------------ clients/modernsystem/Makefile.am | 19 ---------- clients/modernsystem/config/CMakeLists.txt | 24 ------------ clients/modernsystem/config/Makefile.am | 14 ------- clients/plastik/CMakeLists.txt | 26 +------------ clients/plastik/Makefile.am | 19 ---------- clients/plastik/config/CMakeLists.txt | 20 ---------- clients/plastik/config/Makefile.am | 14 ------- clients/quartz/CMakeLists.txt | 31 +-------------- clients/quartz/Makefile.am | 23 ----------- clients/quartz/config/CMakeLists.txt | 20 ---------- clients/quartz/config/Makefile.am | 16 -------- clients/redmond/CMakeLists.txt | 23 +---------- clients/redmond/Makefile.am | 17 --------- clients/web/CMakeLists.txt | 20 ---------- clients/web/Makefile.am | 15 -------- kcmkwin/CMakeLists.txt | 12 ------ kcmkwin/Makefile.am | 1 - kcmkwin/kwindecoration/CMakeLists.txt | 22 ----------- kcmkwin/kwindecoration/Makefile.am | 16 -------- kcmkwin/kwinoptions/CMakeLists.txt | 24 ------------ kcmkwin/kwinoptions/Makefile.am | 17 --------- kcmkwin/kwinrules/CMakeLists.txt | 36 ------------------ kcmkwin/kwinrules/Makefile.am | 27 ------------- killer/CMakeLists.txt | 18 --------- killer/Makefile.am | 9 ----- pics/Makefile.am | 9 ----- tools/CMakeLists.txt | 20 ---------- tools/Makefile.am | 11 ------ tools/decobenchmark/CMakeLists.txt | 18 --------- tools/decobenchmark/Makefile.am | 9 ----- 51 files changed, 7 insertions(+), 995 deletions(-) delete mode 100644 Makefile.am delete mode 100644 clients/Makefile.am delete mode 100644 clients/b2/config/Makefile.am delete mode 100644 clients/default/config/Makefile.am delete mode 100644 clients/keramik/Makefile.am delete mode 100644 clients/keramik/config/Makefile.am delete mode 100644 clients/kwmtheme/Makefile.am delete mode 100644 clients/kwmtheme/cli_installer/Makefile.am delete mode 100644 clients/laptop/Makefile.am delete mode 100644 clients/modernsystem/Makefile.am delete mode 100644 clients/modernsystem/config/Makefile.am delete mode 100644 clients/plastik/Makefile.am delete mode 100644 clients/plastik/config/Makefile.am delete mode 100644 clients/quartz/Makefile.am delete mode 100644 clients/quartz/config/Makefile.am delete mode 100644 clients/redmond/Makefile.am delete mode 100644 clients/web/Makefile.am delete mode 100644 kcmkwin/Makefile.am delete mode 100644 kcmkwin/kwindecoration/Makefile.am delete mode 100644 kcmkwin/kwinoptions/Makefile.am delete mode 100644 kcmkwin/kwinrules/Makefile.am delete mode 100644 killer/Makefile.am delete mode 100644 pics/Makefile.am delete mode 100644 tools/Makefile.am delete mode 100644 tools/decobenchmark/Makefile.am diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b302d3129..775efa3207 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,41 +60,3 @@ install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/kwin ) kde4_install_icons( ${ICON_INSTALL_DIR} ) - - -#original Makefile.am contents follow: - -#INCLUDES = -I$(srcdir)/lib $(all_includes) -# -#SUBDIRS = lib . killer kcmkwin pics clients oldheaders data -# -#bin_PROGRAMS = -#lib_LTLIBRARIES = -#kdeinit_LTLIBRARIES = kwin.la -# -#kwin_la_SOURCES = workspace.cpp client.cpp placement.cpp atoms.cpp \ -# utils.cpp layers.cpp main.cpp popupinfo.cpp tabbox.cpp \ -# options.cpp plugins.cpp events.cpp KWinInterface.skel \ -# killwindow.cpp geometrytip.cpp sm.cpp group.cpp bridge.cpp \ -# manage.cpp notifications.cpp activation.cpp useractions.cpp \ -# geometry.cpp rules.cpp -# -#kwin_la_LIBADD = $(LIB_KDEUI) lib/libkdecorations.la -#kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version -# -#include_HEADERS = KWinInterface.h -# -#KDE_ICON = kwin -# -#METASOURCES = AUTO -# -#messages: rc.cpp -# $(XGETTEXT) *.h *.cpp killer/*.cpp lib/*.cpp -o $(podir)/kwin.pot -# -#kwin_datadir = $(kde_datadir)/kwin -# -#kwin_data_DATA= eventsrc -# -#kde_kcfg_DATA = kwin.kcfg -# -#include ../../admin/Doxyfile.am diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 97726e1f14..0000000000 --- a/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -INCLUDES = -I$(srcdir)/lib $(all_includes) - -if include_kompmgr -KOMPMGR=kompmgr -endif - -SUBDIRS = lib . killer kcmkwin pics clients oldheaders data $(KOMPMGR) - -bin_PROGRAMS = -lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = kwin.la - -kwin_la_SOURCES = workspace.cpp client.cpp placement.cpp atoms.cpp \ - utils.cpp layers.cpp main.cpp popupinfo.cpp tabbox.cpp \ - options.cpp plugins.cpp events.cpp KWinInterface.skel \ - killwindow.cpp geometrytip.cpp sm.cpp group.cpp bridge.cpp \ - manage.cpp notifications.cpp activation.cpp useractions.cpp \ - geometry.cpp rules.cpp - -kwin_la_LIBADD = $(LIB_KDEUI) lib/libkdecorations.la -kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version - -include_HEADERS = KWinInterface.h - -KDE_ICON = kwin - -METASOURCES = AUTO - - -kwin_datadir = $(kde_datadir)/kwin - -kwin_data_DATA= eventsrc - -kde_kcfg_DATA = kwin.kcfg - -include ../../admin/Doxyfile.am diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt index 4910501c9c..883586865c 100644 --- a/clients/CMakeLists.txt +++ b/clients/CMakeLists.txt @@ -8,20 +8,3 @@ add_subdirectory( modernsystem ) add_subdirectory( quartz ) add_subdirectory( redmond ) add_subdirectory( web ) - -########### install files ############### - - - - - -#original Makefile.am contents follow: - -#SUBDIRS = plastik b2 default keramik laptop modernsystem quartz redmond web -## need to be ported: kwmtheme (almost done) -## only for testing: test -# -#messages: rc.cpp -# $(EXTRACTRC) `find . -name \*.ui` >> rc.cpp -# $(XGETTEXT) `find . -name \*.cpp` -o $(podir)/kwin_clients.pot -# -rm rc.cpp diff --git a/clients/Makefile.am b/clients/Makefile.am deleted file mode 100644 index 7929a4cb47..0000000000 --- a/clients/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = plastik b2 default keramik laptop modernsystem quartz redmond web -# need to be ported: kwmtheme (almost done) -# only for testing: test - diff --git a/clients/b2/CMakeLists.txt b/clients/b2/CMakeLists.txt index 6215c28305..e4163fd13a 100644 --- a/clients/b2/CMakeLists.txt +++ b/clients/b2/CMakeLists.txt @@ -14,7 +14,7 @@ kde4_add_plugin(kwin3_b2 ${kwin3_b2_PART_SRCS}) kde4_install_libtool_file(${PLUGIN_INSTALL_DIR} kwin3_b2) -target_link_libraries(kwin3_b2 ${KDE4_KDECORE_LIBS} ${KDE4_KDEFX_LIBS} kdecorations ${QT_QT3SUPPORT_LIBRARY} ${X11_LIBRARIES} ${QT_QTGUI_LIBRARY}) +target_link_libraries(kwin3_b2 ${KDE4_KDEFX_LIBS} kdecorations ${QT_QT3SUPPORT_LIBRARY} ${X11_LIBRARIES} ${QT_QTGUI_LIBRARY}) install(TARGETS kwin3_b2 DESTINATION ${PLUGIN_INSTALL_DIR}) @@ -22,32 +22,3 @@ install(TARGETS kwin3_b2 DESTINATION ${PLUGIN_INSTALL_DIR}) ########### install files ############### install( FILES b2.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin/ ) - - - - -#original Makefile.am contents follow: - -# -#INCLUDES = -I$(srcdir)/../../lib $(all_includes) -# -#SUBDIRS = . config -# -#kde_module_LTLIBRARIES = kwin3_b2.la -# -#kwin3_b2_la_SOURCES = b2client.cpp -#kwin3_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -## kwin_b2_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) -#kwin3_b2_la_LIBADD = ../../lib/libkdecorations.la -lkdefx -# -#METASOURCES = AUTO -#noinst_HEADERS = b2client.h -# -#lnkdir = $(kde_datadir)/kwin/ -#lnk_DATA = b2.desktop -# -#EXTRA_DIST = $(lnk_DATA) -# -####KMAKE-start (don't edit or delete this block) -# -####KMAKE-end diff --git a/clients/b2/config/CMakeLists.txt b/clients/b2/config/CMakeLists.txt index ec7250108d..b1ff97a996 100644 --- a/clients/b2/config/CMakeLists.txt +++ b/clients/b2/config/CMakeLists.txt @@ -19,25 +19,3 @@ 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/b2/config/Makefile.am b/clients/b2/config/Makefile.am deleted file mode 100644 index 9ad21f7d41..0000000000 --- a/clients/b2/config/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -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 44133975d3..6294b8286c 100644 --- a/clients/default/CMakeLists.txt +++ b/clients/default/CMakeLists.txt @@ -13,30 +13,6 @@ kde4_add_plugin(kwin3_default ${kwin3_default_PART_SRCS}) kde4_install_libtool_file(${PLUGIN_INSTALL_DIR} kwin3_default) -target_link_libraries(kwin3_default ${KDE4_KDECORE_LIBS} ${KDE4_KDEFX_LIBS} kdecorations ${QT_QTGUI_LIBRARY}) +target_link_libraries(kwin3_default ${KDE4_KDEFX_LIBS} 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 985c3ab205..cd00d36d65 100644 --- a/clients/default/config/CMakeLists.txt +++ b/clients/default/config/CMakeLists.txt @@ -19,25 +19,3 @@ 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/default/config/Makefile.am b/clients/default/config/Makefile.am deleted file mode 100644 index a6e09522aa..0000000000 --- a/clients/default/config/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -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 81eb547aaf..917285a5ee 100644 --- a/clients/keramik/CMakeLists.txt +++ b/clients/keramik/CMakeLists.txt @@ -25,28 +25,3 @@ 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/Makefile.am b/clients/keramik/Makefile.am deleted file mode 100644 index a06593f69d..0000000000 --- a/clients/keramik/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -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 98aa8ed34b..c406a27268 100644 --- a/clients/keramik/config/CMakeLists.txt +++ b/clients/keramik/config/CMakeLists.txt @@ -17,23 +17,3 @@ target_link_libraries(kwin_keramik_config ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY install(TARGETS kwin_keramik_config DESTINATION ${PLUGIN_INSTALL_DIR} ) - - - - - -#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/keramik/config/Makefile.am b/clients/keramik/config/Makefile.am deleted file mode 100644 index 3021635ca9..0000000000 --- a/clients/keramik/config/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -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 6b880ae251..6b01975b0d 100644 --- a/clients/kwmtheme/CMakeLists.txt +++ b/clients/kwmtheme/CMakeLists.txt @@ -24,22 +24,3 @@ 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/kwmtheme/Makefile.am b/clients/kwmtheme/Makefile.am deleted file mode 100644 index f6c6111809..0000000000 --- a/clients/kwmtheme/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -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/kwmtheme/cli_installer/CMakeLists.txt b/clients/kwmtheme/cli_installer/CMakeLists.txt index 0ef3d34711..3ce35ba12e 100644 --- a/clients/kwmtheme/cli_installer/CMakeLists.txt +++ b/clients/kwmtheme/cli_installer/CMakeLists.txt @@ -13,30 +13,3 @@ target_link_libraries(kwmtheme ${KDE4_KDECORE_LIBS} ) install(TARGETS kwmtheme DESTINATION ${BIN_INSTALL_DIR}) - -########### install files ############### - - - - - -#original Makefile.am contents follow: - -# -## set the include path for X, qt and KDE -#INCLUDES= $(all_includes) -# -######## This part is very kwmtheme specific -## you can add here more. This one gets installed -#bin_PROGRAMS = kwmtheme -# -## Which sources should be compiled for kwmtheme. -#kwmtheme_SOURCES = main.cpp -# -## the library search path. -#kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) -# -## the libraries to link against. Be aware of the order. First the libraries, -## that depend on the following ones. -#kwmtheme_LDADD = $(LIB_KDECORE) -# diff --git a/clients/kwmtheme/cli_installer/Makefile.am b/clients/kwmtheme/cli_installer/Makefile.am deleted file mode 100644 index feb31c424b..0000000000 --- a/clients/kwmtheme/cli_installer/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ - -# set the include path for X, qt and KDE -INCLUDES= $(all_includes) - -####### This part is very kwmtheme specific -# you can add here more. This one gets installed -bin_PROGRAMS = kwmtheme - -# Which sources should be compiled for kwmtheme. -kwmtheme_SOURCES = main.cpp - -# the library search path. -kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) - -# the libraries to link against. Be aware of the order. First the libraries, -# that depend on the following ones. -kwmtheme_LDADD = $(LIB_KDECORE) - diff --git a/clients/laptop/CMakeLists.txt b/clients/laptop/CMakeLists.txt index 73b0967591..d1e163f5b5 100644 --- a/clients/laptop/CMakeLists.txt +++ b/clients/laptop/CMakeLists.txt @@ -12,7 +12,7 @@ kde4_add_plugin(kwin3_laptop ${kwin3_laptop_PART_SRCS}) kde4_install_libtool_file(${PLUGIN_INSTALL_DIR} kwin3_laptop) -target_link_libraries(kwin3_laptop ${KDE4_KDECORE_LIBS} ${KDE4_KDEFX_LIBS} kdecorations) +target_link_libraries(kwin3_laptop ${KDE4_KDEFX_LIBS} kdecorations) install(TARGETS kwin3_laptop DESTINATION ${PLUGIN_INSTALL_DIR}) @@ -21,25 +21,3 @@ install(TARGETS kwin3_laptop DESTINATION ${PLUGIN_INSTALL_DIR}) 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/laptop/Makefile.am b/clients/laptop/Makefile.am deleted file mode 100644 index 0c134fd557..0000000000 --- a/clients/laptop/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ - -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 c76816d3f0..b295467594 100644 --- a/clients/modernsystem/CMakeLists.txt +++ b/clients/modernsystem/CMakeLists.txt @@ -14,7 +14,7 @@ kde4_add_plugin(kwin3_modernsys ${kwin3_modernsys_PART_SRCS}) kde4_install_libtool_file(${PLUGIN_INSTALL_DIR} kwin3_modernsys) -target_link_libraries(kwin3_modernsys ${KDE4_KDECORE_LIBS} ${KDE4_KDEFX_LIBS} kdecorations ${QT_QTGUI_LIBRARY}) +target_link_libraries(kwin3_modernsys ${KDE4_KDEFX_LIBS} kdecorations ${QT_QTGUI_LIBRARY}) install(TARGETS kwin3_modernsys DESTINATION ${PLUGIN_INSTALL_DIR}) @@ -23,27 +23,3 @@ install(TARGETS kwin3_modernsys DESTINATION ${PLUGIN_INSTALL_DIR}) 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/Makefile.am b/clients/modernsystem/Makefile.am deleted file mode 100644 index 2d9e5c5260..0000000000 --- a/clients/modernsystem/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ - -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 557eed150e..882b304c18 100644 --- a/clients/modernsystem/config/CMakeLists.txt +++ b/clients/modernsystem/config/CMakeLists.txt @@ -15,27 +15,3 @@ target_link_libraries(kwin_modernsys_config ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRA 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/modernsystem/config/Makefile.am b/clients/modernsystem/config/Makefile.am deleted file mode 100644 index 79bf212901..0000000000 --- a/clients/modernsystem/config/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ - -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 e80448e670..bc1fdbe881 100644 --- a/clients/plastik/CMakeLists.txt +++ b/clients/plastik/CMakeLists.txt @@ -18,7 +18,7 @@ kde4_add_plugin(kwin3_plastik ${kwin3_plastik_PART_SRCS}) kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_plastik ) -target_link_libraries(kwin3_plastik ${KDE4_KDEUI_LIBS} kdecorations kdefx) +target_link_libraries(kwin3_plastik kdecorations ${KDE4_KDEFX_LIBS}) install(TARGETS kwin3_plastik DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -27,27 +27,3 @@ 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/Makefile.am b/clients/plastik/Makefile.am deleted file mode 100644 index 78e71f763e..0000000000 --- a/clients/plastik/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -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 256b5c7eeb..6f3e0afc9f 100644 --- a/clients/plastik/config/CMakeLists.txt +++ b/clients/plastik/config/CMakeLists.txt @@ -16,23 +16,3 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin_plastik_config ) target_link_libraries(kwin_plastik_config ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY}) install(TARGETS kwin_plastik_config DESTINATION ${PLUGIN_INSTALL_DIR} ) - - - - -#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/plastik/config/Makefile.am b/clients/plastik/config/Makefile.am deleted file mode 100644 index 78a4b05027..0000000000 --- a/clients/plastik/config/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -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 305d8b2f1e..fa6fe08253 100644 --- a/clients/quartz/CMakeLists.txt +++ b/clients/quartz/CMakeLists.txt @@ -14,7 +14,7 @@ kde4_add_plugin(kwin3_quartz ${kwin3_quartz_PART_SRCS}) kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_quartz ) -target_link_libraries(kwin3_quartz ${KDE4_KDEUI_LIBS} kdecorations kdefx) +target_link_libraries(kwin3_quartz kdecorations ${KDE4_KDEFX_LIBS}) install(TARGETS kwin3_quartz DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -22,32 +22,3 @@ 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/Makefile.am b/clients/quartz/Makefile.am deleted file mode 100644 index d66643ba54..0000000000 --- a/clients/quartz/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ - -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 9d343f713a..facd0367ba 100644 --- a/clients/quartz/config/CMakeLists.txt +++ b/clients/quartz/config/CMakeLists.txt @@ -14,23 +14,3 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin_quartz_config ) target_link_libraries(kwin_quartz_config ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY}) install(TARGETS kwin_quartz_config DESTINATION ${PLUGIN_INSTALL_DIR} ) - - -#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/quartz/config/Makefile.am b/clients/quartz/config/Makefile.am deleted file mode 100644 index eb64880ee3..0000000000 --- a/clients/quartz/config/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -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 38efbde0fc..769434fa87 100644 --- a/clients/redmond/CMakeLists.txt +++ b/clients/redmond/CMakeLists.txt @@ -13,7 +13,7 @@ kde4_add_plugin(kwin3_redmond ${kwin3_redmond_PART_SRCS}) kde4_install_libtool_file(${PLUGIN_INSTALL_DIR} kwin3_redmond) -target_link_libraries(kwin3_redmond ${KDE4_KDECORE_LIBS} ${KDE4_KDEFX_LIBS} kdecorations) +target_link_libraries(kwin3_redmond ${KDE4_KDEFX_LIBS} kdecorations) install(TARGETS kwin3_redmond DESTINATION ${PLUGIN_INSTALL_DIR}) @@ -23,24 +23,3 @@ 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/redmond/Makefile.am b/clients/redmond/Makefile.am deleted file mode 100644 index 86115be9c1..0000000000 --- a/clients/redmond/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ - -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/web/CMakeLists.txt b/clients/web/CMakeLists.txt index a687c420ab..f90c8f52d6 100644 --- a/clients/web/CMakeLists.txt +++ b/clients/web/CMakeLists.txt @@ -21,23 +21,3 @@ 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/clients/web/Makefile.am b/clients/web/Makefile.am deleted file mode 100644 index 3619301f44..0000000000 --- a/clients/web/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -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/CMakeLists.txt b/kcmkwin/CMakeLists.txt index b1642e1585..f65bea601c 100644 --- a/kcmkwin/CMakeLists.txt +++ b/kcmkwin/CMakeLists.txt @@ -2,15 +2,3 @@ add_subdirectory( kwinoptions ) add_subdirectory( kwindecoration ) add_subdirectory( kwinrules ) - - - -########### install files ############### - - - - - -#original Makefile.am contents follow: - -#SUBDIRS = kwinoptions kwindecoration kwinrules diff --git a/kcmkwin/Makefile.am b/kcmkwin/Makefile.am deleted file mode 100644 index ff552e928c..0000000000 --- a/kcmkwin/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = kwinoptions kwindecoration kwinrules diff --git a/kcmkwin/kwindecoration/CMakeLists.txt b/kcmkwin/kwindecoration/CMakeLists.txt index 10be71f605..b00f1587ca 100644 --- a/kcmkwin/kwindecoration/CMakeLists.txt +++ b/kcmkwin/kwindecoration/CMakeLists.txt @@ -22,25 +22,3 @@ install(TARGETS kcm_kwindecoration DESTINATION ${PLUGIN_INSTALL_DIR} ) install( FILES kwindecoration.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) - - -#original Makefile.am contents follow: - -#INCLUDES = -I$(srcdir)/../../lib $(all_includes) -# -#kde_module_LTLIBRARIES = kcm_kwindecoration.la -# -#kcm_kwindecoration_la_SOURCES = kwindecoration.cpp buttons.cpp kwindecorationIface.skel preview.cpp -#noinst_HEADERS = kwindecoration.h kwindecorationIface.h buttons.h preview.h -# -#kcm_kwindecoration_la_LDFLAGS = \ -# -module -avoid-version $(all_libraries) -no-undefined -# -#kcm_kwindecoration_la_LIBADD = $(LIB_KDEUI) ../../lib/libkdecorations.la -# -#METASOURCES = AUTO -# -#messages: -# $(XGETTEXT) *.cpp -o $(podir)/kcmkwindecoration.pot -# -#xdg_apps_DATA = kwindecoration.desktop diff --git a/kcmkwin/kwindecoration/Makefile.am b/kcmkwin/kwindecoration/Makefile.am deleted file mode 100644 index 6591422e16..0000000000 --- a/kcmkwin/kwindecoration/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -INCLUDES = -I$(srcdir)/../../lib $(all_includes) - -kde_module_LTLIBRARIES = kcm_kwindecoration.la - -kcm_kwindecoration_la_SOURCES = kwindecoration.cpp buttons.cpp kwindecorationIface.skel preview.cpp -noinst_HEADERS = kwindecoration.h kwindecorationIface.h buttons.h preview.h - -kcm_kwindecoration_la_LDFLAGS = \ - -module -avoid-version $(all_libraries) -no-undefined - -kcm_kwindecoration_la_LIBADD = $(LIB_KDEUI) ../../lib/libkdecorations.la - -METASOURCES = AUTO - - -xdg_apps_DATA = kwindecoration.desktop diff --git a/kcmkwin/kwinoptions/CMakeLists.txt b/kcmkwin/kwinoptions/CMakeLists.txt index 28404eba45..eb57ff9c32 100644 --- a/kcmkwin/kwinoptions/CMakeLists.txt +++ b/kcmkwin/kwinoptions/CMakeLists.txt @@ -24,27 +24,3 @@ install( FILES kwinoptions.desktop kwinactions.desktop kwinadvanced.desktop kde4_install_icons( ${ICON_INSTALL_DIR} ) - - - -#original Makefile.am contents follow: - -#METASOURCES = AUTO -#INCLUDES = $(all_includes) -# -#kde_module_LTLIBRARIES = kcm_kwinoptions.la -# -#kcm_kwinoptions_la_SOURCES = windows.cpp mouse.cpp main.cpp -#kcm_kwinoptions_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined -#kcm_kwinoptions_la_LIBADD = $(LIB_KDEUI) -# -#noinst_HEADERS = windows.h mouse.h -# -#messages: -# $(XGETTEXT) *.cpp -o $(podir)/kcmkwm.pot -# -#kwin_kcmkwin_options_data_DATA = kwinactions.desktop kwinadvanced.desktop kwinfocus.desktop kwinmoving.desktop kwintranslucency.desktop -#kwin_kcmkwin_options_datadir = $(kde_appsdir)/.hidden -# -#xdg_apps_DATA = kwinoptions.desktop -#KDE_ICON=AUTO diff --git a/kcmkwin/kwinoptions/Makefile.am b/kcmkwin/kwinoptions/Makefile.am deleted file mode 100644 index 93e5bdfbc3..0000000000 --- a/kcmkwin/kwinoptions/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -METASOURCES = AUTO -INCLUDES = $(all_includes) - -kde_module_LTLIBRARIES = kcm_kwinoptions.la - -kcm_kwinoptions_la_SOURCES = windows.cpp mouse.cpp main.cpp -kcm_kwinoptions_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined -kcm_kwinoptions_la_LIBADD = $(LIB_KDEUI) - -noinst_HEADERS = windows.h mouse.h - - -kwin_kcmkwin_options_data_DATA = kwinactions.desktop kwinadvanced.desktop kwinfocus.desktop kwinmoving.desktop kwintranslucency.desktop -kwin_kcmkwin_options_datadir = $(kde_appsdir)/.hidden - -xdg_apps_DATA = kwinoptions.desktop -KDE_ICON=AUTO diff --git a/kcmkwin/kwinrules/CMakeLists.txt b/kcmkwin/kwinrules/CMakeLists.txt index 2def58d0c5..f889773804 100644 --- a/kcmkwin/kwinrules/CMakeLists.txt +++ b/kcmkwin/kwinrules/CMakeLists.txt @@ -34,44 +34,8 @@ target_link_libraries(kcm_kwinrules ${KDE4_KDEUI_LIBS} ) 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 diff --git a/kcmkwin/kwinrules/Makefile.am b/kcmkwin/kwinrules/Makefile.am deleted file mode 100644 index f240648bdf..0000000000 --- a/kcmkwin/kwinrules/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -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 - - -xdg_apps_DATA = kwinrules.desktop diff --git a/killer/CMakeLists.txt b/killer/CMakeLists.txt index 07f96e10f1..6afba0b114 100644 --- a/killer/CMakeLists.txt +++ b/killer/CMakeLists.txt @@ -13,21 +13,3 @@ target_link_libraries(kwin_killer_helper ${KDE4_KDEUI_LIBS} ) install(TARGETS kwin_killer_helper DESTINATION ${BIN_INSTALL_DIR}) - -########### install files ############### - - - - - -#original Makefile.am contents follow: - -#INCLUDES = $(all_includes) -# -#bin_PROGRAMS = kwin_killer_helper -# -#kwin_killer_helper_SOURCES = killer.cpp -#kwin_killer_helper_LDADD = $(LIB_KDEUI) -#kwin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) -# -#METASOURCES = AUTO diff --git a/killer/Makefile.am b/killer/Makefile.am deleted file mode 100644 index acbf5e77db..0000000000 --- a/killer/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -INCLUDES = $(all_includes) - -bin_PROGRAMS = kwin_killer_helper - -kwin_killer_helper_SOURCES = killer.cpp -kwin_killer_helper_LDADD = $(LIB_KDEUI) -kwin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) - -METASOURCES = AUTO diff --git a/pics/Makefile.am b/pics/Makefile.am deleted file mode 100644 index 8558a612cb..0000000000 --- a/pics/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -kwin_pics_data_DATA = close.png maximize.png maximizedown.png menu.png \ - iconify.png pindown.png pinup.png unknown.png fog.png \ - fog-grey.png bluesun.png greenie.light.png greenie.dim.png - -kwin_pics_datadir = $(kde_datadir)/kwin/pics - -EXTRA_DIST = $(kwin_pics_data_DATA) - diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 3d23ccc332..4157ec181d 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -13,23 +13,3 @@ kde4_add_executable(test_gravity ${test_gravity_SRCS}) target_link_libraries(test_gravity ${KDE4_KDECORE_LIBS} ) - -########### install files ############### - - - - - -#original Makefile.am contents follow: - -#noinst_PROGRAMS = test_gravity -# -#SUBDIRS = decobenchmark -# -#INCLUDES = $(all_includes) -# -#test_gravity_SOURCES = test_gravity.cpp -#test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) -#test_gravity_LDADD = $(LIB_X11) -# -#METASOURCES = AUTO diff --git a/tools/Makefile.am b/tools/Makefile.am deleted file mode 100644 index da92d969de..0000000000 --- a/tools/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -noinst_PROGRAMS = test_gravity - -SUBDIRS = decobenchmark - -INCLUDES = $(all_includes) - -test_gravity_SOURCES = test_gravity.cpp -test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) -test_gravity_LDADD = $(LIB_X11) - -METASOURCES = AUTO diff --git a/tools/decobenchmark/CMakeLists.txt b/tools/decobenchmark/CMakeLists.txt index e8ea6078c9..03c0aa33bb 100644 --- a/tools/decobenchmark/CMakeLists.txt +++ b/tools/decobenchmark/CMakeLists.txt @@ -11,21 +11,3 @@ kde4_add_executable(decobenchmark ${decobenchmark_SRCS}) target_link_libraries(decobenchmark ${KDE4_KDECORE_LIBS} kdecorations ) - -########### install files ############### - - - - - -#original Makefile.am contents follow: - -#noinst_PROGRAMS = decobenchmark -# -#INCLUDES = $(all_includes) -# -#decobenchmark_SOURCES = main.cpp preview.cpp -#decobenchmark_LDFLAGS = $(all_libraries) -#decobenchmark_LDADD = ../../lib/libkdecorations.la -# -#METASOURCES = AUTO diff --git a/tools/decobenchmark/Makefile.am b/tools/decobenchmark/Makefile.am deleted file mode 100644 index 306c89971d..0000000000 --- a/tools/decobenchmark/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -noinst_PROGRAMS = decobenchmark - -INCLUDES = $(all_includes) - -decobenchmark_SOURCES = main.cpp preview.cpp -decobenchmark_LDFLAGS = $(all_libraries) -decobenchmark_LDADD = ../../lib/libkdecorations.la - -METASOURCES = AUTO