diff options
author | Lennart Poettering <lennart@poettering.net> | 2008-09-08 17:22:27 +0300 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2008-09-08 17:22:27 +0300 |
commit | 821dc1797faa903618c7585d3c053fd7ae6e93db (patch) | |
tree | 7bf2d978d04440fccb17a59fd0a42a1bb2379112 | |
parent | f2164023fd0fda8c1a456c5c2f144f8943c24db9 (diff) |
move autospawn lock to pulsecore/ since we don't need it in the client anymore
-rw-r--r-- | src/Makefile.am | 7 | ||||
-rw-r--r-- | src/daemon/main.c | 2 | ||||
-rw-r--r-- | src/pulsecore/lock-autospawn.c (renamed from src/pulse/lock-autospawn.c) | 0 | ||||
-rw-r--r-- | src/pulsecore/lock-autospawn.h (renamed from src/pulse/lock-autospawn.h) | 0 | ||||
-rw-r--r-- | src/tests/lock-autospawn-test.c | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 3ee53722..1663d66d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -541,8 +541,7 @@ libpulse_la_SOURCES = \ pulse/xmalloc.c pulse/xmalloc.h \ pulse/proplist.c pulse/proplist.h \ pulse/ext-stream-restore.c pulse/ext-stream-restore.h \ - pulse/i18n.c pulse/i18n.h \ - pulse/lock-autospawn.c pulse/lock-autospawn.h + pulse/i18n.c pulse/i18n.h # Internal stuff that is shared with libpulsecore libpulse_la_SOURCES += \ @@ -740,8 +739,7 @@ libpulsecore_la_SOURCES = \ pulse/volume.c pulse/volume.h \ pulse/xmalloc.c pulse/xmalloc.h \ pulse/proplist.c pulse/proplist.h \ - pulse/i18n.c pulse/i18n.h \ - pulse/lock-autospawn.c pulse/lock-autospawn.h + pulse/i18n.c pulse/i18n.h # Pure core stuff (some are shared in libpulse though). libpulsecore_la_SOURCES += \ @@ -811,6 +809,7 @@ libpulsecore_la_SOURCES += \ pulsecore/start-child.c pulsecore/start-child.h \ pulsecore/envelope.c pulsecore/envelope.h \ pulsecore/proplist-util.c pulsecore/proplist-util.h \ + pulsecore/lock-autospawn.c pulsecore/lock-autospawn.h \ $(PA_THREAD_OBJS) if OS_IS_WIN32 diff --git a/src/daemon/main.c b/src/daemon/main.c index f91573b4..a9e8ed46 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -65,8 +65,8 @@ #include <pulse/timeval.h> #include <pulse/xmalloc.h> #include <pulse/i18n.h> -#include <pulse/lock-autospawn.h> +#include <pulsecore/lock-autospawn.h> #include <pulsecore/winsock.h> #include <pulsecore/core-error.h> #include <pulsecore/core.h> diff --git a/src/pulse/lock-autospawn.c b/src/pulsecore/lock-autospawn.c index d36b669e..d36b669e 100644 --- a/src/pulse/lock-autospawn.c +++ b/src/pulsecore/lock-autospawn.c diff --git a/src/pulse/lock-autospawn.h b/src/pulsecore/lock-autospawn.h index c04c4bd1..c04c4bd1 100644 --- a/src/pulse/lock-autospawn.h +++ b/src/pulsecore/lock-autospawn.h diff --git a/src/tests/lock-autospawn-test.c b/src/tests/lock-autospawn-test.c index cb3dc87c..80cfda6a 100644 --- a/src/tests/lock-autospawn-test.c +++ b/src/tests/lock-autospawn-test.c @@ -28,7 +28,7 @@ #include <pulsecore/macro.h> #include <pulsecore/thread.h> -#include <pulse/lock-autospawn.h> +#include <pulsecore/lock-autospawn.h> #include <pulse/util.h> static void thread_func(void*k) { |