move autospawn lock to pulsecore/ since we don't need it in the client anymore

diff --git a/src/Makefile.am b/src/Makefile.am
index 3ee5372200648b9b0a2cf9161019d498322512ec..1663d66d965244a26a6a2176463e0f6a6c2895bc 100644 (file)
--- 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 f91573b4c36b87bc7f6494f6203b4ce1d28f377d..a9e8ed4626afc94fa85e82c467a1a832106fd6bf 100644 (file)
--- 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
similarity index 100%
rename from src/pulse/lock-autospawn.c
rename to src/pulsecore/lock-autospawn.c

diff --git a/src/pulse/lock-autospawn.h b/src/pulsecore/lock-autospawn.h
similarity index 100%
rename from src/pulse/lock-autospawn.h
rename to src/pulsecore/lock-autospawn.h

diff --git a/src/tests/lock-autospawn-test.c b/src/tests/lock-autospawn-test.c
index cb3dc87c847b5ec81effedd2a02562548409f77c..80cfda6aa6e4520279968ed9ffabe9003afcebe4 100644 (file)
--- 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) {