TDE
/
tdemultimedia
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdemultimedia
0
0
Fork 0
Code Issues Releases Wiki Activity

Fixed kdemultimedia FTBFS under oneiric

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1258501 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent ae35c8f0c0
commit 9f3b0a3806
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File

4
juk/Makefile.am
Unescape View File

@ -85,12 +85,12 @@ endif
##################################################
juk_LDADD = -lm $(LDADD_GST) $(mblibs) $(LIB_KIO) $(taglib_libs) $(akode_libs) $(LIB_KHTML) $(LIB_ARTS)
juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST)
juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
tagguessertest_LDADD = $(LIB_KDECORE)
tagguessertest_LDFLAGS = $(all_libraries)
tagguessertest_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
SUBDIRS = pics

8
kaboodle/Makefile.am
Unescape View File

@ -15,8 +15,8 @@ libkaboodle_noinst_la_SOURCES = conf.cpp \
libs = $(LIB_KPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde -lkmediaplayer
libkaboodlepart_la_SOURCES = dummy.cpp
libkaboodlepart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
libkaboodlepart_la_LIBADD = libkaboodle_noinst.la $(libs)
libkaboodlepart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
libkaboodlepart_la_LIBADD = libkaboodle_noinst.la $(libs) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
kaboodle_SOURCES = main.cpp \
kaboodleapp.cpp \
@ -27,8 +27,8 @@ dummy.cpp:
CLEANFILES = dummy.cpp
kaboodle_LDADD = libkaboodle_noinst.la $(libs)
kaboodle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kaboodle_LDADD = libkaboodle_noinst.la $(libs) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
kaboodle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
bin_PROGRAMS = kaboodle

4
kaudiocreator/Makefile.am
Unescape View File

@ -12,7 +12,7 @@ kaudiocreator_SOURCES = main.cpp kaudiocreator.cpp encoder.cpp \
EXTRA_DIST = encoder.h kaudiocreator.h kaudiocreator.desktop encoderconfigimp.h \
obqueimp.h ripper.h tracksimp.h encodefileimp.h
kaudiocreator_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lkutils
kaudiocreator_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lkutils $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO
@ -20,7 +20,7 @@ messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/kaudiocreator.pot
kaudiocreator_LDADD = $(LIB_KIO) $(top_builddir)/libkcddb/libkcddb.la \
$(top_builddir)/kscd/libkcompactdisc.la
$(top_builddir)/kscd/libkcompactdisc.la $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
KDE_ICON = AUTO

14
krec/Makefile.am
Unescape View File

@ -42,7 +42,7 @@ krec_la_SOURCES = \
main.cpp \
krecord.cpp
krec_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
krec_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects
krec_la_LIBADD = \
lib_krec_common.la \
$(top_builddir)/arts/gui/kde/libartsgui_kde.la \
@ -50,11 +50,13 @@ krec_la_LIBADD = \
-lartskde $(LIBDL) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KUTILS)
kcm_krec_la_SOURCES = krecconfigure.cpp
kcm_krec_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
kcm_krec_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects
kcm_krec_la_LIBADD = lib_krec_common.la $(LIB_KUTILS)
kcm_krec_files_la_SOURCES = krecconfig_files.cpp
kcm_krec_files_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
kcm_krec_files_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects
kcm_krec_files_la_LIBADD = lib_krec_common.la $(LIB_KUTILS)
lib_krec_common_la_SOURCES = \
@ -62,11 +64,13 @@ lib_krec_common_la_SOURCES = \
krecexport_template.cpp \
krecconfig_fileswidget.cpp
lib_krec_common_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
lib_krec_common_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects
lib_krec_common_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
libkrecexport_wave_la_SOURCES = krecexport_wave.cpp
libkrecexport_wave_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
libkrecexport_wave_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects
libkrecexport_wave_la_LIBADD = lib_krec_common.la
rcdir = $(kde_datadir)/krec

3
kscd/Makefile.am
Unescape View File

@ -19,13 +19,14 @@ noinst_LTLIBRARIES = libkcompactdisc.la
libkcompactdisc_la_SOURCES = kcompactdisc.cpp
libkcompactdisc_la_LIBADD = $(top_builddir)/kscd/libwm/libworkman.la
libkcompactdisc_la_LDFLAGS = $(all_libraries) -lpthread
kde_kcfg_DATA = kscd.kcfg
kscd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kscd_LDADD = $(LIBCDROM) $(LIBCDAUDIO) \
$(LIBFPE) $(LIB_KIO) -lkutils $(top_builddir)/libkcddb/libkcddb.la \
libkcompactdisc.la
libkcompactdisc.la -lpthread
profiledata_DATA = kscd.profile.xml
profiledatadir = $(kde_datadir)/profiles

Write Preview
Loading…
Cancel
Save