summaryrefslogtreecommitdiffstats
path: root/arts
diff options
context:
space:
mode:
Diffstat (limited to 'arts')
-rw-r--r--arts/builder/Makefile.am2
-rw-r--r--arts/gui/kde/Makefile.am6
-rw-r--r--arts/midi/Makefile.am4
-rw-r--r--arts/modules/common/Makefile.am2
-rw-r--r--arts/tools/Makefile.am8
5 files changed, 11 insertions, 11 deletions
diff --git a/arts/builder/Makefile.am b/arts/builder/Makefile.am
index f65fd42..4740809 100644
--- a/arts/builder/Makefile.am
+++ b/arts/builder/Makefile.am
@@ -21,7 +21,7 @@ noinst_HEADERS = qttableview.h
METASOURCES = AUTO
-artsbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl
+artsbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl
# the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones.
diff --git a/arts/gui/kde/Makefile.am b/arts/gui/kde/Makefile.am
index 440af44..a0fc326 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_TDEIO) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_QT) -ltdefx \
+libartsgui_kde_la_LIBADD = $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TQT) -ltdefx \
$(top_builddir)/arts/gui/common/libartsgui_idl.la
libartsgui_kde_la_LDFLAGS = $(all_libraries) -no-undefined
libartsgui_kde_la_COMPILE_FIRST = ../common/artsgui.h
@@ -23,12 +23,12 @@ libartsgui_kde_la_COMPILE_FIRST = ../common/artsgui.h
artstestgui_SOURCES = artstestgui.cpp
artstestgui_LDADD = -lmcop -lqtmcop -ltdecore -lartsflow \
$(top_builddir)/arts/gui/common/libartsgui_idl.la
-artstestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+artstestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
dbtest_SOURCES = dbtest.cpp
dbtest_LDADD = -lqtmcop -ltdecore -lartsflow \
$(top_builddir)/arts/gui/kde/libartsgui_kde.la
-dbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+dbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
libartsgui_kde_la_METASOURCES = AUTO
diff --git a/arts/midi/Makefile.am b/arts/midi/Makefile.am
index d097dc8..fc12052 100644
--- a/arts/midi/Makefile.am
+++ b/arts/midi/Makefile.am
@@ -9,12 +9,12 @@ bin_PROGRAMS = midisend
noinst_PROGRAMS = midisynctest
midisend_SOURCES = midisend.cc midimsg.c
-midisend_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_RPATH) $(LIBPTHREAD) $(LIB_QT) -lmcop -lartsflow_idl
+midisend_LDFLAGS = $(all_libraries) $(LIB_TQT) $(KDE_RPATH) $(LIBPTHREAD) $(LIB_TQT) -lmcop -lartsflow_idl
midisend_LDADD = libartsmidi_idl.la -lartsflow_idl
midisend_COMPILE_FIRST = artsmidi.h
midisynctest_SOURCES = midisynctest.cc
-midisynctest_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_RPATH) $(LIBPTHREAD) $(LIB_QT) -lmcop -lartsflow_idl -lartsmidi_idl
+midisynctest_LDFLAGS = $(all_libraries) $(LIB_TQT) $(KDE_RPATH) $(LIBPTHREAD) $(LIB_TQT) -lmcop -lartsflow_idl -lartsmidi_idl
midisynctest_LDADD = libartsmidi.la -lsoundserver_idl -lartsflow_idl -lartsmidi_idl
midisynctest_COMPILE_FIRST = artsmidi.h
diff --git a/arts/modules/common/Makefile.am b/arts/modules/common/Makefile.am
index bcf472f..1841d23 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_TDECORE) $(LIB_QT) -lgthread-2.0 $(ARTS_LIBS)
+ -lartsflow -lartsflow_idl -lmcop $(LIB_TDECORE) $(LIB_TQT) -lgthread-2.0 $(ARTS_LIBS)
libartsmodulescommon_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined
diff --git a/arts/tools/Makefile.am b/arts/tools/Makefile.am
index 49b9055..138afe4 100644
--- a/arts/tools/Makefile.am
+++ b/arts/tools/Makefile.am
@@ -32,8 +32,8 @@ SOMAJOR = 1
SOMINOR = 0
SOSUBMINOR = 0
-libartscontrolapplet_la_LDFLAGS = $(all_libraries) -lmcop -lartsflow_idl -L../gui/common -lartsgui_idl -L../gui/kde -lartsgui_kde -L../midi -lartsmidi -lartsmidi_idl -L../modules/effects -lartsmoduleseffects -L../modules/synth -lartsmodulessynth -L../modules/common -lartsmodulescommon $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR) -no-undefined -module
-libartscontrolsupport_la_LDFLAGS = $(all_libraries) -lmcop -lartsflow_idl -L../gui/common -lartsgui_idl -L../gui/kde -lartsgui_kde -L../midi -lartsmidi -lartsmidi_idl -L../modules/effects -lartsmoduleseffects -L../modules/synth -lartsmodulessynth -L../modules/common -lartsmodulescommon $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR) -no-undefined
+libartscontrolapplet_la_LDFLAGS = $(all_libraries) -lmcop -lartsflow_idl -L../gui/common -lartsgui_idl -L../gui/kde -lartsgui_kde -L../midi -lartsmidi -lartsmidi_idl -L../modules/effects -lartsmoduleseffects -L../modules/synth -lartsmodulessynth -L../modules/common -lartsmodulescommon $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR) -no-undefined -module
+libartscontrolsupport_la_LDFLAGS = $(all_libraries) -lmcop -lartsflow_idl -L../gui/common -lartsgui_idl -L../gui/kde -lartsgui_kde -L../midi -lartsmidi -lartsmidi_idl -L../modules/effects -lartsmoduleseffects -L../modules/synth -lartsmodulessynth -L../modules/common -lartsmodulescommon $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR) -no-undefined
libartscontrolapplet_la_LIBADD = \
-lartsflow -lartsflow_idl -lmcop -lqtmcop $(LIBDL) -lsoundserver_idl -lartskde \
@@ -57,10 +57,10 @@ libartscontrolsupport_la_LIBADD = \
bin_PROGRAMS = artscontrol
artscontrol_SOURCES = main.cpp levelmeters.cpp
-artscontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lartsflow -lmcop -lartsflow_idl -L../gui/common -lartsgui_idl -L../gui/kde -lartsgui_kde -L../midi -lartsmidi -lartsmidi_idl -L../modules/effects -lartsmoduleseffects -L../modules/synth -lartsmodulessynth -L../modules/common -lartsmodulescommon $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
+artscontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lartsflow -lmcop -lartsflow_idl -L../gui/common -lartsgui_idl -L../gui/kde -lartsgui_kde -L../midi -lartsmidi -lartsmidi_idl -L../modules/effects -lartsmoduleseffects -L../modules/synth -lartsmodulessynth -L../modules/common -lartsmodulescommon $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
artscontrol_LDADD = libartscontrolsupport.la \
$(LIB_TDEUI) $(LIB_TDESYCOCA) $(LIB_TDEFILE) \
- -lqtmcop -lartsflow -lartsflow_idl -lsoundserver_idl -lartskde -lmcop -lartsflow_idl -L../gui/common -lartsgui_idl -L../gui/kde -lartsgui_kde -L../midi -lartsmidi -lartsmidi_idl -L../modules/effects -lartsmoduleseffects -L../modules/synth -lartsmodulessynth -L../modules/common -lartsmodulescommon $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
+ -lqtmcop -lartsflow -lartsflow_idl -lsoundserver_idl -lartskde -lmcop -lartsflow_idl -L../gui/common -lartsgui_idl -L../gui/kde -lartsgui_kde -L../midi -lartsmidi -lartsmidi_idl -L../modules/effects -lartsmoduleseffects -L../modules/synth -lartsmodulessynth -L../modules/common -lartsmodulescommon $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
xdg_apps_DATA = artscontrol.desktop