From 005e011f7da996ee7739ba84628032cbbff46cfb Mon Sep 17 00:00:00 2001
From: Nedko Arnaudov <nedko@arnaudov.name>
Date: Sat, 22 Aug 2009 16:55:55 +0300
Subject: [PATCH] Move catdup() from daemon/ to top dir, it is needed for
 gladish too

---
 daemon/catdup.c => catdup.c | 6 +-----
 daemon/catdup.h => catdup.h | 0
 common.h                    | 2 ++
 daemon/appdb.c              | 2 +-
 daemon/common.h             | 1 -
 daemon/log.c                | 2 +-
 gui/common.h                | 1 -
 wscript                     | 3 ++-
 8 files changed, 7 insertions(+), 10 deletions(-)
 rename daemon/catdup.c => catdup.c (94%)
 rename daemon/catdup.h => catdup.h (100%)

diff --git a/daemon/catdup.c b/catdup.c
similarity index 94%
rename from daemon/catdup.c
rename to catdup.c
index 17aa47ae..ad025a8f 100644
--- a/daemon/catdup.c
+++ b/catdup.c
@@ -24,11 +24,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#include "../common/debug.h"
+#include "common.h"
 #include "catdup.h"
 
 char * catdup(const char * s1, const char * s2)
diff --git a/daemon/catdup.h b/catdup.h
similarity index 100%
rename from daemon/catdup.h
rename to catdup.h
diff --git a/common.h b/common.h
index 278c0fed..6eca7bf1 100644
--- a/common.h
+++ b/common.h
@@ -41,4 +41,6 @@
 #include "common/klist.h"
 #endif
 
+#include "common/debug.h"    /* log macros */
+
 #endif /* #ifndef COMMON_H__82C9504A_ACD2_435D_9743_781943473E6A__INCLUDED */
diff --git a/daemon/appdb.c b/daemon/appdb.c
index 377ea243..7e8925a4 100644
--- a/daemon/appdb.c
+++ b/daemon/appdb.c
@@ -33,7 +33,7 @@
 
 #include "appdb.h"
 #include "../common/debug.h"
-#include "catdup.h"
+#include "../catdup.h"
 
 void
 lash_appdb_free_entry(
diff --git a/daemon/common.h b/daemon/common.h
index 817842c0..e7911525 100644
--- a/daemon/common.h
+++ b/daemon/common.h
@@ -35,7 +35,6 @@
 
 #include "../dbus/service.h"
 #include "../dbus/helpers.h"
-#include "../common/debug.h"
 
 /* JACK port or virtual port */
 struct port
diff --git a/daemon/log.c b/daemon/log.c
index 23f8aef1..08452300 100644
--- a/daemon/log.c
+++ b/daemon/log.c
@@ -36,7 +36,7 @@
 #include <time.h>
 
 #include "../common/debug.h"
-#include "catdup.h"
+#include "../catdup.h"
 
 #define DEFAULT_XDG_LOG "/.log"
 #define LASH_XDG_SUBDIR "/lash"
diff --git a/gui/common.h b/gui/common.h
index 621be0d7..fdef2d26 100644
--- a/gui/common.h
+++ b/gui/common.h
@@ -28,6 +28,5 @@
 #define COMMON_H__15E63B7A_8350_4ABD_B04C_592158354949__INCLUDED
 
 #include "../common.h"
-#include "../common/debug.h"    /* log macros */
 
 #endif /* #ifndef COMMON_H__15E63B7A_8350_4ABD_B04C_592158354949__INCLUDED */
diff --git a/wscript b/wscript
index 046f7b45..63f9db45 100644
--- a/wscript
+++ b/wscript
@@ -165,6 +165,7 @@ def build(bld):
 
     daemon.source = [
         'jack_proxy.c',
+        'catdup.c',
         ]
 
     for source in [
@@ -178,7 +179,6 @@ def build(bld):
         'control.c',
         'jack.c',
         'studio.c',
-        'catdup.c',
         'patchbay.c',
         ]:
         daemon.source.append(os.path.join("daemon", source))
@@ -263,6 +263,7 @@ def build(bld):
     gladish.source = [
         'jack_proxy.c',
         'graph_proxy.c',
+        'catdup.c',
         ]
 
     for source in [