diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-28 03:18:35 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-28 03:18:35 +0000 |
| commit | 746a2c4f876cd0c3c4307a0c3cf5f7131802a16c (patch) | |
| tree | d818fd44860e24a163b4d6c0be3e6c976b5a79ce /soundserver | |
| parent | 342e55467d1ec4e8bf8783396183c227efd92957 (diff) | |
| download | arts-746a2c4f876cd0c3c4307a0c3cf5f7131802a16c.tar.gz arts-746a2c4f876cd0c3c4307a0c3cf5f7131802a16c.zip | |
Fix Qt namespace conflicts in arts
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/arts@1222998 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'soundserver')
| -rw-r--r-- | soundserver/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/soundserver/Makefile.am b/soundserver/Makefile.am index eee67b4..7105c9e 100644 --- a/soundserver/Makefile.am +++ b/soundserver/Makefile.am @@ -53,23 +53,23 @@ libartsgslplayobject_la_COMPILE_FIRST = soundserver.h ../flow/artsflow.h bin_PROGRAMS = artsd artsplay artscat artswrapper artsshell artsrec -artsd_LDADD = libsoundserver_idl.la $(FLOWLIBS) \ +artsd_LDADD = libsoundserver_idl.la $(LIB_QT) $(FLOWLIBS) \ $(top_builddir)/mcop_mt/libmcop_mt.la artsd_LDFLAGS = $(USE_THREADS) artsd_SOURCES = soundserverv2_impl.cc soundserver_impl.cc simplesoundserver_impl.cc artsd.cc cpuusage.cc samplestorage_impl.cc crashhandler.cc soundserverstartup_impl.cc artsd_COMPILE_FIRST = soundserver.h artsversion.h -artscat_LDADD = libsoundserver_idl.la $(FLOWLIBS) $(LIBPTHREAD) +artscat_LDADD = libsoundserver_idl.la $(LIB_QT) $(FLOWLIBS) $(LIBPTHREAD) artscat_LDFLAGS = $(USE_THREADS) artscat_SOURCES = artscat.cc artscat_COMPILE_FIRST = soundserver.h artsversion.h -artsrec_LDADD = libsoundserver_idl.la $(FLOWLIBS) $(LIBPTHREAD) +artsrec_LDADD = libsoundserver_idl.la $(LIB_QT) $(FLOWLIBS) $(LIBPTHREAD) artsrec_LDFLAGS = $(USE_THREADS) artsrec_SOURCES = artsrec.cc artsrec_COMPILE_FIRST = soundserver.h artsversion.h -artsplay_LDADD = libsoundserver_idl.la $(LIBPTHREAD) +artsplay_LDADD = libsoundserver_idl.la $(LIB_QT) $(LIBPTHREAD) artsplay_LDFLAGS = $(USE_THREADS) artsplay_SOURCES = artsplay.cc artsplay_COMPILE_FIRST = soundserver.h artsversion.h @@ -80,7 +80,7 @@ artswrapper_INCLUDES = -I$(top_builddir) -DEXECUTE=\"$(artsdpath)\" artswrapper_LDADD = $(LIBPOSIX4) artswrapper_LDFLAGS = $(KDE_USE_PIE) -artsshell_LDADD = libsoundserver_idl.la $(LIBPTHREAD) +artsshell_LDADD = libsoundserver_idl.la $(LIB_QT) $(LIBPTHREAD) artsshell_LDFLAGS = $(USE_THREADS) artsshell_SOURCES = artsshell.cc tradercheck.cc artsshell_COMPILE_FIRST = soundserver.h artsversion.h ../flow/artsflow.h |