Move catdup() from daemon/ to top dir, it is needed for gladish too
This commit is contained in:
parent
7d554b7dc0
commit
005e011f7d
|
@ -24,11 +24,7 @@
|
||||||
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <string.h>
|
#include "common.h"
|
||||||
#include <stdlib.h>
|
|
||||||
#include <assert.h>
|
|
||||||
|
|
||||||
#include "../common/debug.h"
|
|
||||||
#include "catdup.h"
|
#include "catdup.h"
|
||||||
|
|
||||||
char * catdup(const char * s1, const char * s2)
|
char * catdup(const char * s1, const char * s2)
|
2
common.h
2
common.h
|
@ -41,4 +41,6 @@
|
||||||
#include "common/klist.h"
|
#include "common/klist.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "common/debug.h" /* log macros */
|
||||||
|
|
||||||
#endif /* #ifndef COMMON_H__82C9504A_ACD2_435D_9743_781943473E6A__INCLUDED */
|
#endif /* #ifndef COMMON_H__82C9504A_ACD2_435D_9743_781943473E6A__INCLUDED */
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
|
|
||||||
#include "appdb.h"
|
#include "appdb.h"
|
||||||
#include "../common/debug.h"
|
#include "../common/debug.h"
|
||||||
#include "catdup.h"
|
#include "../catdup.h"
|
||||||
|
|
||||||
void
|
void
|
||||||
lash_appdb_free_entry(
|
lash_appdb_free_entry(
|
||||||
|
|
|
@ -35,7 +35,6 @@
|
||||||
|
|
||||||
#include "../dbus/service.h"
|
#include "../dbus/service.h"
|
||||||
#include "../dbus/helpers.h"
|
#include "../dbus/helpers.h"
|
||||||
#include "../common/debug.h"
|
|
||||||
|
|
||||||
/* JACK port or virtual port */
|
/* JACK port or virtual port */
|
||||||
struct port
|
struct port
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
#include "../common/debug.h"
|
#include "../common/debug.h"
|
||||||
#include "catdup.h"
|
#include "../catdup.h"
|
||||||
|
|
||||||
#define DEFAULT_XDG_LOG "/.log"
|
#define DEFAULT_XDG_LOG "/.log"
|
||||||
#define LASH_XDG_SUBDIR "/lash"
|
#define LASH_XDG_SUBDIR "/lash"
|
||||||
|
|
|
@ -28,6 +28,5 @@
|
||||||
#define COMMON_H__15E63B7A_8350_4ABD_B04C_592158354949__INCLUDED
|
#define COMMON_H__15E63B7A_8350_4ABD_B04C_592158354949__INCLUDED
|
||||||
|
|
||||||
#include "../common.h"
|
#include "../common.h"
|
||||||
#include "../common/debug.h" /* log macros */
|
|
||||||
|
|
||||||
#endif /* #ifndef COMMON_H__15E63B7A_8350_4ABD_B04C_592158354949__INCLUDED */
|
#endif /* #ifndef COMMON_H__15E63B7A_8350_4ABD_B04C_592158354949__INCLUDED */
|
||||||
|
|
3
wscript
3
wscript
|
@ -165,6 +165,7 @@ def build(bld):
|
||||||
|
|
||||||
daemon.source = [
|
daemon.source = [
|
||||||
'jack_proxy.c',
|
'jack_proxy.c',
|
||||||
|
'catdup.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
for source in [
|
for source in [
|
||||||
|
@ -178,7 +179,6 @@ def build(bld):
|
||||||
'control.c',
|
'control.c',
|
||||||
'jack.c',
|
'jack.c',
|
||||||
'studio.c',
|
'studio.c',
|
||||||
'catdup.c',
|
|
||||||
'patchbay.c',
|
'patchbay.c',
|
||||||
]:
|
]:
|
||||||
daemon.source.append(os.path.join("daemon", source))
|
daemon.source.append(os.path.join("daemon", source))
|
||||||
|
@ -263,6 +263,7 @@ def build(bld):
|
||||||
gladish.source = [
|
gladish.source = [
|
||||||
'jack_proxy.c',
|
'jack_proxy.c',
|
||||||
'graph_proxy.c',
|
'graph_proxy.c',
|
||||||
|
'catdup.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
for source in [
|
for source in [
|
||||||
|
|
Loading…
Reference in New Issue