As kdelibs/NAMING says, using lib<appname>.la as name for a library is bad.
Library name changed to libkdecorations.la . svn path=/trunk/kdebase/kwin/; revision=251859
This commit is contained in:
parent
c33987fd9e
commit
87fa54326f
10 changed files with 13 additions and 13 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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 \
|
||||
|
|
Loading…
Reference in a new issue