Move catdup() from daemon/ to top dir, it is needed for gladish too

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)

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 */

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(

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

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"

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 */

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 [