Merge most of elmarco/rtclock2

[pulseaudio] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index cb96070dc10d80df522fda76b7ac8b74b9c5adbc..c580ece89a7fd3ace0109722726a1aaeef988b6e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,6 +64,11 @@ AM_CFLAGS = \
        -I$(top_srcdir)/src/modules/alsa \
        -I$(top_builddir)/src/modules/alsa \
        -I$(top_srcdir)/src/modules/raop \
+       -I$(top_builddir)/src/modules/raop \
+       -I$(top_srcdir)/src/modules/x11 \
+       -I$(top_builddir)/src/modules/x11 \
+       -I$(top_srcdir)/src/modules/jack \
+       -I$(top_builddir)/src/modules/jack \
        $(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS \
        $(LIBSAMPLERATE_CFLAGS) \
        $(LIBSNDFILE_CFLAGS) \
@@ -561,6 +566,7 @@ libpulsecommon_@PA_MAJORMINORMICRO@_la_SOURCES = \
                pulsecore/authkey.c pulsecore/authkey.h \
                pulsecore/conf-parser.c pulsecore/conf-parser.h \
                pulsecore/core-error.c pulsecore/core-error.h \
+               pulsecore/core-rtclock.c pulsecore/core-rtclock.h \
                pulsecore/core-util.c pulsecore/core-util.h \
                pulsecore/rtkit.c pulsecore/rtkit.h \
                pulsecore/creds.h \
@@ -600,7 +606,6 @@ libpulsecommon_@PA_MAJORMINORMICRO@_la_SOURCES = \
                pulsecore/queue.c pulsecore/queue.h \
                pulsecore/random.c pulsecore/random.h \
                pulsecore/refcnt.h \
-               pulsecore/rtclock.c pulsecore/rtclock.h \
                pulsecore/shm.c pulsecore/shm.h \
                pulsecore/bitset.c pulsecore/bitset.h \
                pulsecore/socket-client.c pulsecore/socket-client.h \
@@ -678,6 +683,7 @@ pulseinclude_HEADERS = \
                pulse/operation.h \
                pulse/proplist.h \
                pulse/pulseaudio.h \
+               pulse/rtclock.h \
                pulse/sample.h \
                pulse/scache.h \
                pulse/simple.h \
@@ -728,6 +734,7 @@ libpulse_la_SOURCES = \
                pulse/operation.c pulse/operation.h \
                pulse/proplist.c pulse/proplist.h \
                pulse/pulseaudio.h \
+               pulse/rtclock.c pulse/rtclock.h \
                pulse/sample.c pulse/sample.h \
                pulse/scache.c pulse/scache.h \
                pulse/stream.c pulse/stream.h \