Move common_cli.[ch] out of varnishd, and rename them to cli_common.[ch].

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@705 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/Makefile.am b/varnish-cache/bin/varnishd/Makefile.am
index 26ff3a61f0f89a50c06f1c89eddce13d6b11489b..2764eba93c24f5231aae660e76de9b926f1d3d85 100644 (file)
--- a/varnish-cache/bin/varnishd/Makefile.am
+++ b/varnish-cache/bin/varnishd/Makefile.am
@@ -26,7 +26,6 @@ varnishd_SOURCES = \
        cache_vrt.c \
        cache_vrt_acl.c \
        cache_vrt_re.c \
-       common_cli.c \
        hash_simple_list.c \
        hash_classic.c \
        mgt_child.c \
@@ -43,7 +42,6 @@ varnishd_SOURCES = \
 noinst_HEADERS = \
        cache.h \
        common.h \
-       common_cli.h \
        hash_slinger.h \
        heritage.h \
        mgt.h \

diff --git a/varnish-cache/include/Makefile.am b/varnish-cache/include/Makefile.am
index 03a85aa1753c0577b6cfb355f5efc0e4212223a5..a77d1209ab54ec927e79ab3eb2ddc5de738f4f23 100644 (file)
--- a/varnish-cache/include/Makefile.am
+++ b/varnish-cache/include/Makefile.am
@@ -3,6 +3,7 @@
 noinst_HEADERS = \
        binary_heap.h \
        cli.h \
+       cli_common.h \
        cli_priv.h \
        compat.h \
        hash.h \

diff --git a/varnish-cache/bin/varnishd/common_cli.h b/varnish-cache/include/cli_common.h
similarity index 100%
rename from varnish-cache/bin/varnishd/common_cli.h
rename to varnish-cache/include/cli_common.h

diff --git a/varnish-cache/lib/libvarnish/Makefile.am b/varnish-cache/lib/libvarnish/Makefile.am
index 44fd1052daabd24f4c0e584626515e798b710676..fbd6c6e6385bf1570b95a8e80ee49dd1d00fd58f 100644 (file)
--- a/varnish-cache/lib/libvarnish/Makefile.am
+++ b/varnish-cache/lib/libvarnish/Makefile.am
@@ -8,6 +8,7 @@ libvarnish_la_SOURCES = \
        argv.c \
        binary_heap.c \
        cli.c \
+       cli_common.c \
        time.c
 
 libvarnish_la_CFLAGS = -include config.h

diff --git a/varnish-cache/bin/varnishd/common_cli.c b/varnish-cache/lib/libvarnish/cli_common.c
similarity index 100%
rename from varnish-cache/bin/varnishd/common_cli.c
rename to varnish-cache/lib/libvarnish/cli_common.c