diff options
Diffstat (limited to 'arts')
| -rw-r--r-- | arts/builder/Makefile.am | 2 | ||||
| -rw-r--r-- | arts/gui/kde/Makefile.am | 4 | ||||
| -rw-r--r-- | arts/modules/Makefile.am | 2 | ||||
| -rw-r--r-- | arts/modules/common/Makefile.am | 2 | ||||
| -rw-r--r-- | arts/modules/synth/Makefile.am | 2 | ||||
| -rw-r--r-- | arts/tools/Makefile.am | 16 |
6 files changed, 14 insertions, 14 deletions
diff --git a/arts/builder/Makefile.am b/arts/builder/Makefile.am index ec43c407..0edc1d2f 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_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl +artsbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -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 4dd4c650..71d504ae 100644 --- a/arts/gui/kde/Makefile.am +++ b/arts/gui/kde/Makefile.am @@ -23,12 +23,12 @@ libartsgui_kde_la_COMPILE_FIRST = ../common/artsgui.h artstestgui_SOURCES = artstestgui.cpp artstestgui_LDADD = -lqtmcop -ltdecore -lartsflow \ $(top_builddir)/arts/gui/common/libartsgui_idl.la -artstestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +artstestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor 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_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +dbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor libartsgui_kde_la_METASOURCES = AUTO diff --git a/arts/modules/Makefile.am b/arts/modules/Makefile.am index 1f5fb09c..d604e8b9 100644 --- a/arts/modules/Makefile.am +++ b/arts/modules/Makefile.am @@ -35,7 +35,7 @@ libartsmodules_la_LIBADD = \ $(top_builddir)/arts/modules/common/libartsmodulescommon.la \ $(top_builddir)/arts/modules/effects/libartsmoduleseffects.la \ $(top_builddir)/arts/modules/mixers/libartsmodulesmixers.la \ - -lartsflow -lmcop $(LIB_KDECORE) $(LIBDL) + -lartsflow -lmcop $(LIB_TDECORE) $(LIBDL) libartsmodules_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \ -no-undefined diff --git a/arts/modules/common/Makefile.am b/arts/modules/common/Makefile.am index 6742af36..7ff082db 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_TDECORE) 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..e70751e0 100644 --- a/arts/modules/synth/Makefile.am +++ b/arts/modules/synth/Makefile.am @@ -33,7 +33,7 @@ libartsmodulessynth_la_LIBADD = \ $(top_builddir)/arts/midi/libartsmidi_idl.la \ -lartsflow -lartsgsl -lartsflow_idl -lmcop -#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_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la $(top_builddir)/arts/midi/libartsmidi_idl.la -lartsflow -lartsflow_idl -lmcop $(LIBDL) $(LIB_TDEUI) $(LIB_TDECORE) libartsmodulessynth_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -lartsflow -lartsgsl -no-undefined artsmodulessynth.cc artsmodulessynth.h artsmodulessynth.mcoptype artsmodulessynth.mcopclass: $(srcdir)/artsmodulessynth.idl $(MCOPIDL) diff --git a/arts/tools/Makefile.am b/arts/tools/Makefile.am index 942b8dd5..59900632 100644 --- a/arts/tools/Makefile.am +++ b/arts/tools/Makefile.am @@ -32,12 +32,12 @@ 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_KDECORE) $(LIB_KDEUI) -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_KDECORE) $(LIB_KDEUI) -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_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_LIBADD = \ -lartsflow -lartsflow_idl -lmcop -lqtmcop $(LIBDL) -lsoundserver_idl -lartskde \ - $(LIB_KDEUI) ./libartscontrolsupport.la + $(LIB_TDEUI) ./libartscontrolsupport.la # Arnolds version with dynamic-linking for testing. # @@ -46,21 +46,21 @@ libartscontrolapplet_la_LIBADD = \ # $(top_builddir)/arts/gui/common/libartsgui_idl.la \ # -L$(top_builddir)/arts/gui/kde -lartsgui_kde \ # -L$(top_builddir)/arts/modules -lartsmodules \ -# $(LIB_KDEUI) +# $(LIB_TDEUI) libartscontrolsupport_la_LIBADD = \ -lartsflow -lartsflow_idl -lmcop -lqtmcop $(LIBDL) -lsoundserver_idl -lartskde \ $(top_builddir)/arts/gui/common/libartsgui_idl.la \ $(top_builddir)/arts/gui/kde/libartsgui_kde.la \ $(top_builddir)/arts/modules/libartsmodules.la \ - $(LIB_KDEUI) + $(LIB_TDEUI) 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_KDECORE) $(LIB_KDEUI) +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_LDADD = libartscontrolsupport.la \ - $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIB_KFILE) \ - -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_KDECORE) $(LIB_KDEUI) + $(LIB_TDEUI) $(LIB_KSYCOCA) $(LIB_KFILE) \ + -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) xdg_apps_DATA = artscontrol.desktop |