diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:43 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:43 -0600 |
| commit | cb68a7857c80661d242ee5527ec6f99dc3f79fa7 (patch) | |
| tree | a3b54203ca6bce0e8e1dc5107dc9653db246a281 /arts | |
| parent | 7534907d3759a8c520eeb9a701b316d891c63bdf (diff) | |
| download | tdemultimedia-cb68a7857c80661d242ee5527ec6f99dc3f79fa7.tar.gz tdemultimedia-cb68a7857c80661d242ee5527ec6f99dc3f79fa7.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
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/midi/artsmidi.idl | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arts/builder/Makefile.am b/arts/builder/Makefile.am index 52682a56..fb4af798 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_KIO) -lktexteditor -lmcop -lartsflow_idl +artsbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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 78003d15..d772e884 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +artstestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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_KIO) -lktexteditor +dbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor libartsgui_kde_la_METASOURCES = AUTO diff --git a/arts/midi/artsmidi.idl b/arts/midi/artsmidi.idl index 70157d95..ce1c5891 100644 --- a/arts/midi/artsmidi.idl +++ b/arts/midi/artsmidi.idl @@ -36,7 +36,7 @@ module Arts { /* This is modelled somewhat after - the AudioManager concept - the aRts-0.3.4.1 MidiPort concept - - libkmid + - libtdemid It adds timing as new feature compared to older implementation, and also tries to do the full set of midi operations. |