diff options
| author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2013-04-10 16:56:44 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2013-07-31 12:57:50 +0200 |
| commit | 82e888c6f6d5f99ebb84758723409d2cc61961d6 (patch) | |
| tree | 8b467ed5f5c60f91b2f954ca75818df999e4464e | |
| parent | efb5feb956405d9311db11d61cb3557a4abfa435 (diff) | |
moved gvfsuriutils.{ch} back to common to use them in cmis backend later
| -rw-r--r-- | client/Makefile.am | 9 | ||||
| -rw-r--r-- | common/Makefile.am | 7 | ||||
| -rw-r--r-- | common/gvfsuriutils.c (renamed from client/gvfsuriutils.c) | 0 | ||||
| -rw-r--r-- | common/gvfsuriutils.h (renamed from client/gvfsuriutils.h) | 0 | ||||
| -rw-r--r-- | common/test-uri-utils.c (renamed from client/test-uri-utils.c) | 0 |
5 files changed, 8 insertions, 8 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 356bb578..df51074d 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -17,7 +17,7 @@ module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symb gvfsclientincludedir=$(includedir)/gvfs-client/gvfs/ gvfsclientinclude_HEADERS = \ - gvfsuriutils.h gvfsurimapper.h \ + gvfsurimapper.h \ $(NULL) URI_PARSER_SOURCES = \ @@ -37,7 +37,6 @@ vfssources = \ gdaemonfilemonitor.c gdaemonfilemonitor.h \ gvfsdaemondbus.c gvfsdaemondbus.h \ gvfsiconloadable.c gvfsiconloadable.h \ - gvfsuriutils.c gvfsuriutils.h \ gvfsurimapper.c gvfsurimapper.h \ $(URI_PARSER_SOURCES) \ $(NULL) @@ -55,12 +54,6 @@ libgvfsdbus_la_LDFLAGS = $(module_flags) libgvfsdbus_la_SOURCES = $(vfssources) libgvfsdbus_la_LIBADD = $(vfslibs) ../metadata/libmetadata.la -noinst_PROGRAMS = test-uri-utils - -test_uri_utils_SOURCES = test-uri-utils.c gvfsuriutils.c gvfsuriutils.h -test_uri_utils_LDADD = $(vfslibs) -test_uri_utils_CFLAGS = $(INCLUDES) - if USE_FUSE ## FUSE daemon diff --git a/common/Makefile.am b/common/Makefile.am index 07ac8f42..2d0e1a9c 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -27,6 +27,7 @@ libgvfscommon_la_SOURCES = \ gvfsdaemonprotocol.c gvfsdaemonprotocol.h \ gvfsicon.h gvfsicon.c \ gvfsfileinfo.c gvfsfileinfo.h \ + gvfsuriutils.c gvfsuriutils.h \ $(dbus_built_sources) \ $(NULL) @@ -67,6 +68,12 @@ libgvfscommon_dnssd_la_LIBADD = \ $(GLIB_LIBS) endif +noinst_PROGRAMS = test-uri-utils + +test_uri_utils_SOURCES = test-uri-utils.c gvfsuriutils.c gvfsuriutils.h +test_uri_utils_LDADD = $(GLIB_LIBS) +test_uri_utils_CFLAGS = $(INCLUDES) + EXTRA_DIST = org.gtk.vfs.xml diff --git a/client/gvfsuriutils.c b/common/gvfsuriutils.c index 58a71e19..58a71e19 100644 --- a/client/gvfsuriutils.c +++ b/common/gvfsuriutils.c diff --git a/client/gvfsuriutils.h b/common/gvfsuriutils.h index 3d585931..3d585931 100644 --- a/client/gvfsuriutils.h +++ b/common/gvfsuriutils.h diff --git a/client/test-uri-utils.c b/common/test-uri-utils.c index 4d21f165..4d21f165 100644 --- a/client/test-uri-utils.c +++ b/common/test-uri-utils.c |