summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-08-05 19:24:56 +0200
committerSlávek Banko <slavek.banko@axis.cz>2012-08-05 19:34:03 +0200
commita0891554e8ef571e53cad4b8da9409a2338328e9 (patch)
treee5fac629a6d573d003a534b6320c9875b2a882a4
parent14c32f36c7a442404fbb7377691cbafa6b0f1c0e (diff)
downloadtdemultimedia-a0891554e8ef571e53cad4b8da9409a2338328e9.tar.gz
tdemultimedia-a0891554e8ef571e53cad4b8da9409a2338328e9.zip
Update autotools for new DSO linkage style
Thanks to Francois Andriot for the patch (cherry picked from commit 023e7b38d9438a4262e6b46d9dbb9345597359a5)
-rw-r--r--arts/gui/kde/Makefile.am2
-rw-r--r--arts/modules/common/Makefile.am2
-rw-r--r--arts/modules/synth/Makefile.am2
-rw-r--r--arts/runtime/Makefile.am2
-rw-r--r--juk/Makefile.am2
-rw-r--r--kmid/Makefile.am2
-rw-r--r--kmix/Makefile.am4
-rw-r--r--libkcddb/Makefile.am2
-rw-r--r--noatun/library/Makefile.am4
-rw-r--r--noatun/library/noatunarts/Makefile.am2
-rw-r--r--noatun/modules/winskin/vis/Makefile.am2
11 files changed, 13 insertions, 13 deletions
diff --git a/arts/gui/kde/Makefile.am b/arts/gui/kde/Makefile.am
index 8dd89ff1..6d9bc3f5 100644
--- a/arts/gui/kde/Makefile.am
+++ b/arts/gui/kde/Makefile.am
@@ -15,7 +15,7 @@ libartsgui_kde_la_SOURCES = kwidget_impl.cpp kbutton_impl.cpp \
klevelmeter_normalbars.cpp klevelmeter_firebars.cpp \
ktickmarks_impl.cpp kvolumefader_impl.cpp klabel_impl.cpp
-libartsgui_kde_la_LIBADD = $(LIB_KIO) -lkdecore -lkdeui \
+libartsgui_kde_la_LIBADD = $(LIB_KIO) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_QT) -lkdefx \
$(top_builddir)/arts/gui/common/libartsgui_idl.la
libartsgui_kde_la_LDFLAGS = $(all_libraries) -no-undefined
libartsgui_kde_la_COMPILE_FIRST = ../common/artsgui.h
diff --git a/arts/modules/common/Makefile.am b/arts/modules/common/Makefile.am
index 6742af36..e180579e 100644
--- a/arts/modules/common/Makefile.am
+++ b/arts/modules/common/Makefile.am
@@ -25,7 +25,7 @@ libartsmodulescommon_la_LIBADD = \
$(top_builddir)/arts/gui/common/libartsgui_idl.la \
$(top_builddir)/arts/midi/libartsmidi_idl.la \
$(top_builddir)/arts/modules/synth/libartsmodulessynth.la \
- -lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE)
+ -lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE) $(LIB_QT) $(VORBISFILE_LIBS) -lgthread-2.0
libartsmodulescommon_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined
diff --git a/arts/modules/synth/Makefile.am b/arts/modules/synth/Makefile.am
index e977fa85..1c0c8bf4 100644
--- a/arts/modules/synth/Makefile.am
+++ b/arts/modules/synth/Makefile.am
@@ -31,7 +31,7 @@ libartsmodulessynth_la_COMPILE_FIRST = artsmodulessynth.h ../../midi/artsmidi.h
libartsmodulessynth_la_LIBADD = \
$(top_builddir)/arts/runtime/libartsbuilder.la \
$(top_builddir)/arts/midi/libartsmidi_idl.la \
- -lartsflow -lartsgsl -lartsflow_idl -lmcop
+ -lartsflow -lartsgsl -lartsflow_idl -lmcop -lglib-2.0
#libartsmodulessynth_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la $(top_builddir)/arts/midi/libartsmidi_idl.la -lartsflow -lartsflow_idl -lmcop $(LIBDL) $(LIB_KDEUI) $(LIB_KDECORE)
libartsmodulessynth_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -lartsflow -lartsgsl -no-undefined
diff --git a/arts/runtime/Makefile.am b/arts/runtime/Makefile.am
index b10abe7a..d97ad50b 100644
--- a/arts/runtime/Makefile.am
+++ b/arts/runtime/Makefile.am
@@ -11,7 +11,7 @@ libartsbuilder_la_SOURCES = artsbuilder.cc sequenceutils.cc \
structurebuilder_impl.cc structures_impl.cc moduleinfo.cc \
compatibility.cc localfactory_impl.cc artsbuilderloader_impl.cc
-libartsbuilder_la_LIBADD = -lmcop -lartsflow $(LIBDL)
+libartsbuilder_la_LIBADD = -lmcop -lartsflow $(LIBDL) -lartsflow_idl
libartsbuilder_la_COMPILE_FIRST = artsbuilder.h
libartsbuilder_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
-no-undefined
diff --git a/juk/Makefile.am b/juk/Makefile.am
index a268ea62..c11e699a 100644
--- a/juk/Makefile.am
+++ b/juk/Makefile.am
@@ -85,7 +85,7 @@ 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) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
+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 $(akode_libs)
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
diff --git a/kmid/Makefile.am b/kmid/Makefile.am
index dbcb99e5..728bbca4 100644
--- a/kmid/Makefile.am
+++ b/kmid/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkmidpart.la
lib_LTLIBRARIES = libkmidlib.la
libkmidlib_la_LDFLAGS = $(all_libraries)
-libkmidlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KIO) -lkmid
+libkmidlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KIO) -lkmid $(LIB_QT) $(LIB_KDEUI) -lDCOP $(LIB_KDECORE)
libkmidpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
libkmidpart_la_LIBADD = libkmidlib.la
diff --git a/kmix/Makefile.am b/kmix/Makefile.am
index 15b5c21f..a175818e 100644
--- a/kmix/Makefile.am
+++ b/kmix/Makefile.am
@@ -25,13 +25,13 @@ kmix_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \
volume.cpp kledbutton.cpp verticaltext.cpp mixerIface.skel \
kmixtoolbox.cpp mixertoolbox.cpp dialogviewconfiguration.cpp KMixApp.cpp dialogselectmaster.cpp
-kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
+kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) $(LIB_QT) $(LIB_KDECORE) -lDCOP
kmix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -avoid-version
kmixctrl_la_SOURCES = kmixctrl.cpp mixer.cpp mixset.cpp mixdevice.cpp volume.cpp mixerIface.skel \
mixertoolbox.cpp mixer_backend.cpp
-kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
+kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) $(LIB_QT) -lDCOP
kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version
kmix_panelapplet_la_SOURCES = kmixapplet.cpp \
diff --git a/libkcddb/Makefile.am b/libkcddb/Makefile.am
index e5b88c90..869b2cfe 100644
--- a/libkcddb/Makefile.am
+++ b/libkcddb/Makefile.am
@@ -14,7 +14,7 @@ libkcddb_la_SOURCES = \
cdinfoencodingwidget.cpp cdinfoencodingwidgetbase.ui
libkcddb_la_LDFLAGS = $(all_libraries) -version-info 1:0:0
-libkcddb_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO)
+libkcddb_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO) $(LIB_QT) $(LIB_KDEUI)
METASOURCES = AUTO
diff --git a/noatun/library/Makefile.am b/noatun/library/Makefile.am
index 13ae1e4c..fb4812aa 100644
--- a/noatun/library/Makefile.am
+++ b/noatun/library/Makefile.am
@@ -30,11 +30,11 @@ libnoatun_la_LDFLAGS = \
libnoatun_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui.la \
$(top_builddir)/arts/gui/kde/libartsgui_kde.la $(top_builddir)/arts/modules/libartsmodules.la \
-lkio -lqtmcop -lkmedia2_idl $(top_builddir)/noatun/library/noatunarts/libnoatunarts.la \
- -lartsflow -lsoundserver_idl -lartskde $(LIBDL)
+ -lartsflow -lsoundserver_idl -lartskde $(LIBDL) $(LIB_QT) -lDCOP
libnoatuncontrols_la_SOURCES = controls.cpp scrollinglabel.cpp
libnoatuncontrols_la_LDFLAGS = -version-info 3:0:2 $(KDE_RPATH) $(all_libraries) -no-undefined
-libnoatuncontrols_la_LIBADD = $(LIBDL) $(LIB_KDEUI)
+libnoatuncontrols_la_LIBADD = $(LIBDL) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
METASOURCES = AUTO
META_INCLUDES = $(srcdir)/noatun
diff --git a/noatun/library/noatunarts/Makefile.am b/noatun/library/noatunarts/Makefile.am
index a08e279d..eca2f0f0 100644
--- a/noatun/library/noatunarts/Makefile.am
+++ b/noatun/library/noatunarts/Makefile.am
@@ -7,7 +7,7 @@ libnoatunarts_la_SOURCES = noatunarts.cc fft.c Equalizer_impl.cpp \
StereoVolumeControl_impl.cpp Session_impl.cpp
libnoatunarts_la_COMPILE_FIRST = noatunarts.h
libnoatunarts_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined
-libnoatunarts_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow
+libnoatunarts_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow -lmcop -lartsflow_idl
libnoatunarts_la_METASOURCES = AUTO
noatunarts.mcoptype: noatunarts.h
diff --git a/noatun/modules/winskin/vis/Makefile.am b/noatun/modules/winskin/vis/Makefile.am
index 6935d860..b72036d3 100644
--- a/noatun/modules/winskin/vis/Makefile.am
+++ b/noatun/modules/winskin/vis/Makefile.am
@@ -17,7 +17,7 @@ libwinskinvis_la_SOURCES= winskinvis.cc \
libwinskinvis_la_LDFLAGS= $(all_libraries) -avoid-version \
-no-undefined
-libwinskinvis_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow
+libwinskinvis_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow -lartsflow_idl -lmcop
libwinskinvis_la_COMPILE_FIRST = winskinvis.cc
libwinskinvis_la_METASOURCES = AUTO