move catdup to common/

common/catdup.c

@@ -2,7 +2,7 @@
 /*
  * LADI Session Handler (ladish)
  *
- * Copyright (C) 2009 Nedko Arnaudov <nedko@arnaudov.name>
+ * Copyright (C) 2009,2010 Nedko Arnaudov <nedko@arnaudov.name>
  *
  **************************************************************************
  * This file contains implementation of the catdup() function
@@ -24,7 +24,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "common.h"
+#include "../common.h"
 #include "catdup.h"
 
 char * catdup(const char * s1, const char * s2)

common/catdup.h

@@ -2,7 +2,7 @@
 /*
  * LADI Session Handler (ladish)
  *
- * Copyright (C) 2009 Nedko Arnaudov <nedko@arnaudov.name>
+ * Copyright (C) 2009,2010 Nedko Arnaudov <nedko@arnaudov.name>
  *
  **************************************************************************
  * This file contains prototype of the catdup() function

daemon/appdb.c

@@ -2,7 +2,7 @@
 /*
  * LADI Session Handler (ladish)
  *
- * Copyright (C) 2008, 2009 Nedko Arnaudov <nedko@arnaudov.name>
+ * Copyright (C) 2008,2009,2010 Nedko Arnaudov <nedko@arnaudov.name>
  *
  **************************************************************************
  * This file contains code of the application database
@@ -32,7 +32,7 @@
 
 #include "appdb.h"
 #include "../log.h"
-#include "../catdup.h"
+#include "../common/catdup.h"
 #include "../assert.h"
 
 void

daemon/log.c

@@ -32,7 +32,7 @@
 #include <stdarg.h>
 #include <sys/stat.h>
 
-#include "../catdup.h"
+#include "../common/catdup.h"
 #include "../common/dirhelpers.h"
 
 #define DEFAULT_XDG_LOG "/.log"

daemon/main.c

@@ -39,7 +39,7 @@
 #include "control.h"
 #include "studio.h"
 #include "../dbus_constants.h"
-#include "../catdup.h"
+#include "../common/catdup.h"
 #include "../common/dirhelpers.h"
 #include "../proxies/a2j_proxy.h"
 #include "../proxies/jmcore_proxy.h"

daemon/room_load.c

@@ -32,7 +32,7 @@
 #include <expat.h>
 
 #include "room_internal.h"
-#include "../catdup.h"
+#include "../common/catdup.h"
 #include "load.h"
 #include "../proxies/notify_proxy.h"
 #include "escape.h"

daemon/room_save.c

@@ -32,7 +32,7 @@
 #include <libgen.h>             /* POSIX basename() */
 
 #include "room_internal.h"
-#include "../catdup.h"
+#include "../common/catdup.h"
 #include "save.h"
 #include "../common/dirhelpers.h"
 

daemon/studio.c

@@ -35,7 +35,7 @@
 #include "studio_internal.h"
 #include "../dbus_constants.h"
 #include "control.h"
-#include "../catdup.h"
+#include "../common/catdup.h"
 #include "../common/dirhelpers.h"
 #include "graph_dict.h"
 #include "escape.h"

daemon/virtualizer.c

@@ -31,7 +31,7 @@
 #include "procfs.h"
 #include "app_supervisor.h"
 #include "studio_internal.h"
-#include "../catdup.h"
+#include "../common/catdup.h"
 #include "room.h"
 #include "studio.h"
 

gui/graph_view.c

@@ -30,7 +30,7 @@
 #include "world_tree.h"
 #include "menu.h"
 #include "../proxies/room_proxy.h"
-#include "../catdup.h"
+#include "../common/catdup.h"
 
 struct graph_view
 {

gui/load_project_dialog.c

@@ -28,7 +28,7 @@
 
 #include "load_project_dialog.h"
 #include "gtk_builder.h"
-#include "../catdup.h"
+#include "../common/catdup.h"
 
 enum
 {

gui/main.c

@@ -31,7 +31,7 @@
 #include "../proxies/control_proxy.h"
 #include "world_tree.h"
 #include "graph_view.h"
-#include "../catdup.h"
+#include "../common/catdup.h"
 #include "../proxies/studio_proxy.h"
 #include "create_room_dialog.h"
 #include "menu.h"

gui/pixbuf.c

@@ -25,7 +25,7 @@
  */
 
 #include "common.h"
-#include "../catdup.h"
+#include "../common/catdup.h"
 
 static GdkPixbuf * load_pixbuf_internal(const char * directory, const char * filename)
 {

gui/world_tree.c

@@ -27,7 +27,7 @@
 #include "common.h"
 #include "world_tree.h"
 #include "gtk_builder.h"
-#include "../catdup.h"
+#include "../common/catdup.h"
 #include "menu.h"
 
 enum entry_type

wscript

@@ -241,9 +241,7 @@ def build(bld):
     daemon.ver_header = 'version.h'
     daemon.env.append_value("LINKFLAGS", ["-lutil", "-ldl", "-Wl,-E"])
 
-    daemon.source = [
-        'catdup.c',
-        ]
+    daemon.source = []
 
     for source in [
         'main.c',
@@ -311,6 +309,7 @@ def build(bld):
     for source in [
         'time.c',
         'dirhelpers.c',
+        'catdup.c',
         ]:
         daemon.source.append(os.path.join("common", source))
 
@@ -397,9 +396,7 @@ def build(bld):
         gladish.includes = "build/default" # XXX config.h version.h and other generated files
         gladish.uselib = 'DBUS-1 DBUS-GLIB-1 FLOWCANVAS'
 
-        gladish.source = [
-            'catdup.c',
-            ]
+        gladish.source = []
 
         for source in [
             'main.c',
@@ -443,6 +440,11 @@ def build(bld):
             ]:
             gladish.source.append(os.path.join("dbus", source))
 
+        for source in [
+            'catdup.c',
+            ]:
+            gladish.source.append(os.path.join("common", source))
+
         # GtkBuilder UI definitions (XML)
         bld.install_files(bld.env['DATA_DIR'], 'gui/gladish.ui')