Merge drag+drop rewrite. It's now possible to drag multiple rows in

[disorder] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4ac8cbddc00fe4246895ebf1793927fc6d6768d7..1ab3773704ca3a55306e13b5dbcb358d0a4a971e 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -20,14 +20,13 @@ noinst_LIBRARIES=libdisorder.a
 include_HEADERS=disorder.h
 
 if SERVER
-TRACKDB=trackdb.c
+TRACKDB=trackdb.c trackdb-playlists.c
 else
 TRACKDB=trackdb-stub.c
 endif
 
 libdisorder_a_SOURCES=charset.c charset.h              \
        addr.c addr.h                                   \
-       alsabg.c alsabg.h                               \
        arcfour.c arcfour.h                             \
        authhash.c authhash.h                           \
        basen.c basen.h                                 \
@@ -60,7 +59,6 @@ libdisorder_a_SOURCES=charset.c charset.h             \
        macros.c macros-builtin.c macros.h              \
        mem.c mem.h                                     \
        mime.h mime.c                                   \
-       mixer.c mixer.h mixer-oss.c mixer-alsa.c        \
        printf.c printf.h                               \
        asprintf.c fprintf.c snprintf.c                 \
        queue.c queue.h                                 \
@@ -82,8 +80,10 @@ libdisorder_a_SOURCES=charset.c charset.h            \
        $(TRACKDB) trackdb.h trackdb-int.h              \
        trackname.c trackorder.c trackname.h            \
        tracksort.c                                     \
-       uaudio.c uaudio.h                               \
-       uaudio-oss.c uaudio-coreaudio.c uaudio-rtp.c    \
+       uaudio.c uaudio-thread.c uaudio.h uaudio-apis.c \
+       uaudio-oss.c uaudio-alsa.c                      \
+       uaudio-coreaudio.c                              \
+       uaudio-rtp.c uaudio-command.c uaudio-schedule.c \
        url.h url.c                                     \
        user.h user.c                                   \
        unicode.h unicode.c                             \