From 87fa54326fe46261f467ff7ef8ff0b29511b8be7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Wed, 17 Sep 2003 14:23:53 +0000 Subject: [PATCH] As kdelibs/NAMING says, using lib.la as name for a library is bad. Library name changed to libkdecorations.la . svn path=/trunk/kdebase/kwin/; revision=251859 --- Makefile.am | 2 +- clients/PORTING | 2 +- clients/default/Makefile.am | 2 +- clients/keramik/Makefile.am | 2 +- clients/laptop/Makefile.am | 2 +- clients/modernsystem/Makefile.am | 2 +- clients/redmond/Makefile.am | 2 +- clients/test/Makefile.am | 2 +- kcmkwin/kwindecoration/Makefile.am | 2 +- lib/Makefile.am | 8 ++++---- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index dc4f146d25..fd8c615c0b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,7 @@ kwin_la_SOURCES = workspace.cpp client.cpp placement.cpp atoms.cpp \ manage.cpp notifications.cpp activation.cpp useractions.cpp \ geometry.cpp -kwin_la_LIBADD = $(LIB_KDEUI) lib/libkwin.la +kwin_la_LIBADD = $(LIB_KDEUI) lib/libkdecorations.la kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version include_HEADERS = KWinInterface.h diff --git a/clients/PORTING b/clients/PORTING index 4c1e109e23..d304916fa0 100644 --- a/clients/PORTING +++ b/clients/PORTING @@ -2,7 +2,7 @@ Just a checklist for now, maybe a full HOWTO later. porting: - note that decorations are ported from HEAD, not from the branch - HEAD may have fixes that are not in the branch - - Makefile.am - LDFLAGS, LIBADD, kwin_ -> kwin3_, INCLUDES pro libkwin + - Makefile.am - LDFLAGS, LIBADD, kwin_ -> kwin3_, if in kdebase, add INCLUDES for libkdecorations before $(all_includes) - .desktop - kwin_ -> kwin3_ - KWinButton -> QButton + QToolTip - #include qbutton.h, kdecoration.h, kdecorationfactory.h diff --git a/clients/default/Makefile.am b/clients/default/Makefile.am index 34f289b39b..c9f4da72ed 100644 --- a/clients/default/Makefile.am +++ b/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/libkwin.la +kwin3_default_la_LIBADD = $(LIB_KDECORE) ../../lib/libkdecorations.la METASOURCES = AUTO noinst_HEADERS = kdedefault.h diff --git a/clients/keramik/Makefile.am b/clients/keramik/Makefile.am index b013e40f6e..8b379a31d4 100644 --- a/clients/keramik/Makefile.am +++ b/clients/keramik/Makefile.am @@ -15,7 +15,7 @@ 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/libkwin.la +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 diff --git a/clients/laptop/Makefile.am b/clients/laptop/Makefile.am index 72af0be1fa..eb870720aa 100644 --- a/clients/laptop/Makefile.am +++ b/clients/laptop/Makefile.am @@ -5,7 +5,7 @@ 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/libkwin.la +kwin3_laptop_la_LIBADD = ../../lib/libkdecorations.la METASOURCES = AUTO noinst_HEADERS = laptopclient.h diff --git a/clients/modernsystem/Makefile.am b/clients/modernsystem/Makefile.am index f2daf9ee23..307acb0c7d 100644 --- a/clients/modernsystem/Makefile.am +++ b/clients/modernsystem/Makefile.am @@ -7,7 +7,7 @@ SUBDIRS = config kde_module_LTLIBRARIES = kwin3_modernsys.la kwin3_modernsys_la_SOURCES = modernsys.cpp -kwin3_modernsys_la_LIBADD = ../../lib/libkwin.la +kwin3_modernsys_la_LIBADD = ../../lib/libkdecorations.la kwin3_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module METASOURCES = AUTO diff --git a/clients/redmond/Makefile.am b/clients/redmond/Makefile.am index c16176e875..8341165367 100644 --- a/clients/redmond/Makefile.am +++ b/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/libkwin.la +kwin3_redmond_la_LIBADD = $(LIB_KDECORE) ../../lib/libkdecorations.la METASOURCES = AUTO noinst_HEADERS = redmond.h diff --git a/clients/test/Makefile.am b/clients/test/Makefile.am index 000caa191b..a5a3fcf675 100644 --- a/clients/test/Makefile.am +++ b/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/libkwin.la +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 diff --git a/kcmkwin/kwindecoration/Makefile.am b/kcmkwin/kwindecoration/Makefile.am index 28635aea6d..4d908001fe 100644 --- a/kcmkwin/kwindecoration/Makefile.am +++ b/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/libkwin.la +kcm_kwindecoration_la_LIBADD = $(LIB_KDEUI) ../../lib/libkdecorations.la METASOURCES = AUTO diff --git a/lib/Makefile.am b/lib/Makefile.am index eb604e0cab..12e8cdeccd 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,10 +1,10 @@ # FRAME libkwin??? -lib_LTLIBRARIES = libkwin.la +lib_LTLIBRARIES = libkdecorations.la -libkwin_la_SOURCES = kdecoration.cpp kdecoration_p.cpp kdecoration_plugins_p.cpp \ +libkdecorations_la_SOURCES = kdecoration.cpp kdecoration_p.cpp kdecoration_plugins_p.cpp \ kdecorationfactory.cpp -libkwin_la_LIBADD = $(LIB_KDECORE) -libkwin_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined +libkdecorations_la_LIBADD = $(LIB_KDECORE) +libkdecorations_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined # FRAME include_HEADERS = kdecoration.h kdecoration_p.h kdecoration_plugins_p.h \