Link most Trinity DSOs against the most common kdelibs libraries to compensate for linking changes in modern distributions such as Ubuntu Oneiric

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdetoys@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 5402bbfde7
commit abd26b8d5e

@ -15,7 +15,7 @@ amor_SOURCES = amordialog.cpp amor.cpp amorwidget.cpp main.cpp amoranim.cpp amor
include_HEADERS = AmorIface.h include_HEADERS = AmorIface.h
# the library search path # the library search path
amor_LDFLAGS = $(all_libraries) $(KDE_RPATH) amor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
# the libraries to link against. Be aware of the order. First the libraries, # the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones. # that depend on the following ones.

@ -7,7 +7,7 @@ kodo_SOURCES = main.cpp kodometer.cpp kimagenumber.cpp
METASOURCES = AUTO METASOURCES = AUTO
# the library search path. # the library search path.
kodo_LDFLAGS = $(all_libraries) $(KDE_RPATH) kodo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kodo_LDADD = $(LIB_KDEUI) kodo_LDADD = $(LIB_KDEUI)
messages: messages:

@ -6,7 +6,7 @@ bin_PROGRAMS = kteatime
kteatime_SOURCES = main.cpp toplevel.cpp tealist.cpp timeedit.cpp kteatime_SOURCES = main.cpp toplevel.cpp tealist.cpp timeedit.cpp
kteatime_METASOURCES = AUTO kteatime_METASOURCES = AUTO
kteatime_LDFLAGS = $(all_libraries) $(KDE_RPATH) kteatime_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
# LIB_KIO needed for KNotifyDialog # LIB_KIO needed for KNotifyDialog
kteatime_LDADD = $(LIB_KDEUI) $(LIB_KIO) kteatime_LDADD = $(LIB_KDEUI) $(LIB_KIO)

@ -12,7 +12,7 @@ bin_PROGRAMS = ktux
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
# the library search path. # the library search path.
ktux_LDFLAGS = $(all_libraries) $(KDE_RPATH) ktux_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
# the libraries to link against. # the libraries to link against.
ktux_LDADD = $(LIB_KDEUI) -lkscreensaver ktux_LDADD = $(LIB_KDEUI) -lkscreensaver

@ -55,7 +55,7 @@ kcm_weatherservice_la_LIBADD = $(LIB_KDEUI)
#globaladddir = $(kde_datadir)/konqsidebartng/add #globaladddir = $(kde_datadir)/konqsidebartng/add
#globaladd_DATA = weatherbar_add.desktop #globaladd_DATA = weatherbar_add.desktop
kweatherservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) kweatherservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kweatherservice_LDADD = $(LIB_KIO) kweatherservice_LDADD = $(LIB_KIO)
kweatherservice_SOURCES = main.cpp metar_parser.cpp weatherlib.cpp \ kweatherservice_SOURCES = main.cpp metar_parser.cpp weatherlib.cpp \
weatherservice.cpp weatherservice.skel \ weatherservice.cpp weatherservice.skel \

@ -11,7 +11,7 @@ INCLUDES = $(all_includes)
kworldclock_SOURCES = main.cpp kworldclock_SOURCES = main.cpp
kworldclock_LDADD = libww.la $(LIB_KDEUI) kworldclock_LDADD = libww.la $(LIB_KDEUI)
kworldclock_LDFLAGS = $(KDE_RPATH) $(all_libraries) kworldclock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
xdg_apps_DATA= kworldclock.desktop xdg_apps_DATA= kworldclock.desktop

Loading…
Cancel
Save