diff options
Diffstat (limited to 'kwin')
-rw-r--r-- | kwin/Makefile.am | 2 | ||||
-rw-r--r-- | kwin/clients/b2/config/Makefile.am | 2 | ||||
-rw-r--r-- | kwin/clients/default/Makefile.am | 2 | ||||
-rw-r--r-- | kwin/clients/default/config/Makefile.am | 2 | ||||
-rw-r--r-- | kwin/clients/keramik/Makefile.am | 4 | ||||
-rw-r--r-- | kwin/clients/keramik/config/Makefile.am | 2 | ||||
-rw-r--r-- | kwin/clients/kwmtheme/cli_installer/Makefile.am | 4 | ||||
-rw-r--r-- | kwin/clients/modernsystem/config/Makefile.am | 2 | ||||
-rw-r--r-- | kwin/clients/plastik/Makefile.am | 2 | ||||
-rw-r--r-- | kwin/clients/plastik/config/Makefile.am | 2 | ||||
-rw-r--r-- | kwin/clients/quartz/Makefile.am | 2 | ||||
-rw-r--r-- | kwin/clients/quartz/config/Makefile.am | 2 | ||||
-rw-r--r-- | kwin/clients/redmond/Makefile.am | 2 | ||||
-rw-r--r-- | kwin/clients/test/Makefile.am | 2 | ||||
-rw-r--r-- | kwin/clients/web/Makefile.am | 2 | ||||
-rw-r--r-- | kwin/data/Makefile.am | 4 | ||||
-rw-r--r-- | kwin/kcmkwin/kwindecoration/Makefile.am | 2 | ||||
-rw-r--r-- | kwin/kcmkwin/kwinoptions/Makefile.am | 2 | ||||
-rw-r--r-- | kwin/kcmkwin/kwinrules/Makefile.am | 2 | ||||
-rw-r--r-- | kwin/killer/Makefile.am | 4 | ||||
-rw-r--r-- | kwin/lib/Makefile.am | 2 | ||||
-rw-r--r-- | kwin/tools/Makefile.am | 2 |
22 files changed, 26 insertions, 26 deletions
diff --git a/kwin/Makefile.am b/kwin/Makefile.am index cedb7e423..d7bc669e9 100644 --- a/kwin/Makefile.am +++ b/kwin/Makefile.am @@ -17,7 +17,7 @@ kwin_la_SOURCES = workspace.cpp client.cpp placement.cpp atoms.cpp \ manage.cpp notifications.cpp activation.cpp useractions.cpp \ geometry.cpp rules.cpp -kwin_la_LIBADD = $(LIB_KDEUI) lib/libtdecorations.la +kwin_la_LIBADD = $(LIB_TDEUI) lib/libtdecorations.la kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version include_HEADERS = KWinInterface.h diff --git a/kwin/clients/b2/config/Makefile.am b/kwin/clients/b2/config/Makefile.am index 9ad21f7d4..0a508a3c1 100644 --- a/kwin/clients/b2/config/Makefile.am +++ b/kwin/clients/b2/config/Makefile.am @@ -4,7 +4,7 @@ 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) +kwin_b2_config_la_LIBADD = $(LIB_TDEUI) METASOURCES = AUTO noinst_HEADERS = config.h diff --git a/kwin/clients/default/Makefile.am b/kwin/clients/default/Makefile.am index 5a9ee24a0..331f87822 100644 --- a/kwin/clients/default/Makefile.am +++ b/kwin/clients/default/Makefile.am @@ -7,7 +7,7 @@ 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) ../../lib/libtdecorations.la +kwin3_default_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.la METASOURCES = AUTO noinst_HEADERS = kdedefault.h diff --git a/kwin/clients/default/config/Makefile.am b/kwin/clients/default/config/Makefile.am index a6e09522a..0c6084226 100644 --- a/kwin/clients/default/config/Makefile.am +++ b/kwin/clients/default/config/Makefile.am @@ -4,7 +4,7 @@ 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) +kwin_default_config_la_LIBADD = $(LIB_TDEUI) METASOURCES = AUTO noinst_HEADERS = config.h diff --git a/kwin/clients/keramik/Makefile.am b/kwin/clients/keramik/Makefile.am index 8a04fe9e6..993c9d9ba 100644 --- a/kwin/clients/keramik/Makefile.am +++ b/kwin/clients/keramik/Makefile.am @@ -8,14 +8,14 @@ noinst_HEADERS = tiles.h embedtool_SOURCES = embedtool.cpp embedtool_LDADD = $(LIB_QT) -embedtool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +embedtool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kde_module_LTLIBRARIES = kwin3_keramik.la kwin3_keramik_la_SOURCES = keramik.cpp kwin3_keramik_la_COMPILE_FIRST = tiles.h kwin3_keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin3_keramik_la_LIBADD = $(LIB_KDEUI) ../../lib/libtdecorations.la +kwin3_keramik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la #kwin3_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) METASOURCES = AUTO diff --git a/kwin/clients/keramik/config/Makefile.am b/kwin/clients/keramik/config/Makefile.am index 3021635ca..d4ffce144 100644 --- a/kwin/clients/keramik/config/Makefile.am +++ b/kwin/clients/keramik/config/Makefile.am @@ -4,7 +4,7 @@ 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) +kwin_keramik_config_la_LIBADD = $(LIB_TDEUI) METASOURCES = AUTO noinst_HEADERS = config.h keramikconfig.h diff --git a/kwin/clients/kwmtheme/cli_installer/Makefile.am b/kwin/clients/kwmtheme/cli_installer/Makefile.am index 80033222d..1541c1742 100644 --- a/kwin/clients/kwmtheme/cli_installer/Makefile.am +++ b/kwin/clients/kwmtheme/cli_installer/Makefile.am @@ -10,9 +10,9 @@ bin_PROGRAMS = kwmtheme kwmtheme_SOURCES = main.cpp # the library search path. -kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. -kwmtheme_LDADD = $(LIB_KDECORE) +kwmtheme_LDADD = $(LIB_TDECORE) diff --git a/kwin/clients/modernsystem/config/Makefile.am b/kwin/clients/modernsystem/config/Makefile.am index 79bf21290..55a695684 100644 --- a/kwin/clients/modernsystem/config/Makefile.am +++ b/kwin/clients/modernsystem/config/Makefile.am @@ -5,7 +5,7 @@ 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) +kwin_modernsys_config_la_LIBADD = $(LIB_TDEUI) METASOURCES = AUTO noinst_HEADERS = config.h diff --git a/kwin/clients/plastik/Makefile.am b/kwin/clients/plastik/Makefile.am index 3fd9b652b..cb3f5f447 100644 --- a/kwin/clients/plastik/Makefile.am +++ b/kwin/clients/plastik/Makefile.am @@ -12,7 +12,7 @@ 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/libtdecorations.la +kwin3_plastik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la kwin3_plastik_la_METASOURCES = AUTO DISTCLEANFILES = $(kwin3_plastik_la_METASOURCES) diff --git a/kwin/clients/plastik/config/Makefile.am b/kwin/clients/plastik/config/Makefile.am index 78a4b0502..a7b50219b 100644 --- a/kwin/clients/plastik/config/Makefile.am +++ b/kwin/clients/plastik/config/Makefile.am @@ -4,7 +4,7 @@ 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) +kwin_plastik_config_la_LIBADD = $(LIB_TDEUI) METASOURCES = AUTO noinst_HEADERS = config.h diff --git a/kwin/clients/quartz/Makefile.am b/kwin/clients/quartz/Makefile.am index 9072d16ab..adfc59968 100644 --- a/kwin/clients/quartz/Makefile.am +++ b/kwin/clients/quartz/Makefile.am @@ -7,7 +7,7 @@ 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/libtdecorations.la +kwin3_quartz_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la METASOURCES = AUTO noinst_HEADERS = quartz.h diff --git a/kwin/clients/quartz/config/Makefile.am b/kwin/clients/quartz/config/Makefile.am index eb64880ee..525db9fe1 100644 --- a/kwin/clients/quartz/config/Makefile.am +++ b/kwin/clients/quartz/config/Makefile.am @@ -4,7 +4,7 @@ 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) +kwin_quartz_config_la_LIBADD = $(LIB_TDEUI) METASOURCES = AUTO noinst_HEADERS = config.h diff --git a/kwin/clients/redmond/Makefile.am b/kwin/clients/redmond/Makefile.am index ca45a3e42..7580887b8 100644 --- a/kwin/clients/redmond/Makefile.am +++ b/kwin/clients/redmond/Makefile.am @@ -5,7 +5,7 @@ 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) ../../lib/libtdecorations.la +kwin3_redmond_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.la METASOURCES = AUTO noinst_HEADERS = redmond.h diff --git a/kwin/clients/test/Makefile.am b/kwin/clients/test/Makefile.am index 5ef3d0dac..b63377889 100644 --- a/kwin/clients/test/Makefile.am +++ b/kwin/clients/test/Makefile.am @@ -4,7 +4,7 @@ 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/libtdecorations.la +kwin3_test_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la #kwin_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) METASOURCES = AUTO diff --git a/kwin/clients/web/Makefile.am b/kwin/clients/web/Makefile.am index 32c6b8d1f..bb5080889 100644 --- a/kwin/clients/web/Makefile.am +++ b/kwin/clients/web/Makefile.am @@ -6,7 +6,7 @@ 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/libtdecorations.la +kwin3_web_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la METASOURCES = AUTO linkdir = $(kde_datadir)/kwin/ diff --git a/kwin/data/Makefile.am b/kwin/data/Makefile.am index abdc244f2..3ae92fe7a 100644 --- a/kwin/data/Makefile.am +++ b/kwin/data/Makefile.am @@ -2,11 +2,11 @@ kconf_PROGRAMS = kwin_update_window_settings kwin_update_default_rules kconfdir = $(libdir)/kconf_update_bin kwin_update_window_settings_SOURCES = update_window_settings.cpp -kwin_update_window_settings_LDADD = $(LIB_KDECORE) $(KDE_RPATH) +kwin_update_window_settings_LDADD = $(LIB_TDECORE) $(KDE_RPATH) kwin_update_window_settings_LDFLAGS = $(all_libraries) kwin_update_default_rules_SOURCES = update_default_rules.cpp -kwin_update_default_rules_LDADD = $(LIB_KDECORE) $(KDE_RPATH) +kwin_update_default_rules_LDADD = $(LIB_TDECORE) $(KDE_RPATH) kwin_update_default_rules_LDFLAGS = $(all_libraries) INCLUDES = $(all_includes) diff --git a/kwin/kcmkwin/kwindecoration/Makefile.am b/kwin/kcmkwin/kwindecoration/Makefile.am index 5eb83a8f7..e7bac2af8 100644 --- a/kwin/kcmkwin/kwindecoration/Makefile.am +++ b/kwin/kcmkwin/kwindecoration/Makefile.am @@ -8,7 +8,7 @@ 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/libtdecorations.la +kcm_kwindecoration_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la METASOURCES = AUTO diff --git a/kwin/kcmkwin/kwinoptions/Makefile.am b/kwin/kcmkwin/kwinoptions/Makefile.am index b6abdf0e7..7dd897762 100644 --- a/kwin/kcmkwin/kwinoptions/Makefile.am +++ b/kwin/kcmkwin/kwinoptions/Makefile.am @@ -5,7 +5,7 @@ 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) +kcm_kwinoptions_la_LIBADD = $(LIB_TDEUI) noinst_HEADERS = windows.h mouse.h diff --git a/kwin/kcmkwin/kwinrules/Makefile.am b/kwin/kcmkwin/kwinrules/Makefile.am index b4769c6bd..6fe4b8108 100644 --- a/kwin/kcmkwin/kwinrules/Makefile.am +++ b/kwin/kcmkwin/kwinrules/Makefile.am @@ -11,7 +11,7 @@ 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) +libkwinrules_la_LIBADD = $(LIB_TDEUI) kcm_kwinrules_la_SOURCES = kcm.cpp kcm_kwinrules_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined diff --git a/kwin/killer/Makefile.am b/kwin/killer/Makefile.am index 620543fa0..b55ee7b8c 100644 --- a/kwin/killer/Makefile.am +++ b/kwin/killer/Makefile.am @@ -3,7 +3,7 @@ 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) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kwin_killer_helper_LDADD = $(LIB_TDEUI) +kwin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO diff --git a/kwin/lib/Makefile.am b/kwin/lib/Makefile.am index 79e3f04ac..1ded5c5d8 100644 --- a/kwin/lib/Makefile.am +++ b/kwin/lib/Makefile.am @@ -3,7 +3,7 @@ lib_LTLIBRARIES = libtdecorations.la libtdecorations_la_SOURCES = kdecoration.cpp kdecoration_p.cpp kdecoration_plugins_p.cpp \ kdecorationfactory.cpp kcommondecoration.cpp -libtdecorations_la_LIBADD = $(LIB_KDECORE) +libtdecorations_la_LIBADD = $(LIB_TDECORE) libtdecorations_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined # FRAME diff --git a/kwin/tools/Makefile.am b/kwin/tools/Makefile.am index 8d223282a..7bc1284a5 100644 --- a/kwin/tools/Makefile.am +++ b/kwin/tools/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = decobenchmark INCLUDES = $(all_includes) test_gravity_SOURCES = test_gravity.cpp -test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor test_gravity_LDADD = $(LIB_X11) METASOURCES = AUTO |