let's be more realistic on what we can do here

libvty is not going to happen. Too complex and it's not the goal for this project. For now, let's move it back into the daemon. Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
kronosnet · Sep 17, 2012 · 2023d32 · 2023d32
1 parent b516467
commit 2023d32
Show file tree

Hide file tree

Showing 19 changed files with 22 additions and 54 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -7,17 +7,12 @@ AUTOMAKE_OPTIONS	= foreign
 
 ACLOCAL_AMFLAGS		= -I m4
 
-SUBDIRS			= libtap libknet libvty kronosnetd tests
+SUBDIRS			= libtap libknet kronosnetd tests
 
 if BUILD_DOCS
 SUBDIRS			+= docs
 endif
 
-AM_CFLAGS		= \
-			  -I$(top_srcdir)/libtap \
-			  -I$(top_srcdir)/libknet \
-			  -I$(top_srcdir)/libvty
-
 dist_doc_DATA		= \
 			  COPYING.applications \
 			  COPYING.libraries \

diff --git a/configure.ac b/configure.ac
@@ -283,8 +283,6 @@ AC_CONFIG_FILES([
 		kronosnetd/Makefile
 		libknet/Makefile
 		libknet/libknet.pc
-		libvty/Makefile
-		libvty/libvty.pc
 		docs/Makefile
 		tests/Makefile
 		])

diff --git a/kronosnetd/Makefile.am b/kronosnetd/Makefile.am
@@ -2,24 +2,34 @@ MAINTAINERCLEANFILES	= Makefile.in
 
 noinst_HEADERS		= \
 			  cfg.h \
-			  logging.h
+			  logging.h \
+			  netutils.h \
+			  vty.h \
+			  vty_auth.h \
+			  vty_cli.h \
+			  vty_cli_cmds.h \
+			  vty_utils.h 
 
 sbin_PROGRAMS		= kronosnetd
 
 kronosnetd_SOURCES	= \
 			  cfg.c \
 			  main.c \
-			  logging.c
+			  logging.c \
+			  netutils.c \
+			  vty.c \
+			  vty_auth.c \
+			  vty_cli.c \
+			  vty_cli_cmds.c \
+			  vty_utils.c
 
 kronosnetd_CPPFLAGS	= \
 			  -I$(top_srcdir)/libtap \
-			  -I$(top_srcdir)/libknet \
-			  -I$(top_srcdir)/libvty
+			  -I$(top_srcdir)/libknet
 
 kronosnetd_CFLAGS	= $(LIBQB_CFLAGS)
 
 kronosnetd_LDADD	= \
-			  $(top_builddir)/libvty/libvty.a \
 			  $(top_builddir)/libknet/libknet.a \
 			  $(top_builddir)/libtap/libtap.la \
 			  $(LIBQB_LIBS)
diff --git a/libvty/netutils.c → kronosnetd/netutils.c b/libvty/netutils.c → kronosnetd/netutils.c
diff --git a/libvty/netutils.h → kronosnetd/netutils.h b/libvty/netutils.h → kronosnetd/netutils.h
diff --git a/libvty/vty.c → kronosnetd/vty.c b/libvty/vty.c → kronosnetd/vty.c
diff --git a/libvty/vty.h → kronosnetd/vty.h b/libvty/vty.h → kronosnetd/vty.h
diff --git a/libvty/vty_auth.c → kronosnetd/vty_auth.c b/libvty/vty_auth.c → kronosnetd/vty_auth.c
diff --git a/libvty/vty_auth.h → kronosnetd/vty_auth.h b/libvty/vty_auth.h → kronosnetd/vty_auth.h
diff --git a/libvty/vty_cli.c → kronosnetd/vty_cli.c b/libvty/vty_cli.c → kronosnetd/vty_cli.c
diff --git a/libvty/vty_cli.h → kronosnetd/vty_cli.h b/libvty/vty_cli.h → kronosnetd/vty_cli.h
diff --git a/libvty/vty_cli_cmds.c → kronosnetd/vty_cli_cmds.c b/libvty/vty_cli_cmds.c → kronosnetd/vty_cli_cmds.c
diff --git a/libvty/vty_cli_cmds.h → kronosnetd/vty_cli_cmds.h b/libvty/vty_cli_cmds.h → kronosnetd/vty_cli_cmds.h
diff --git a/libvty/vty_test.c → kronosnetd/vty_test.c b/libvty/vty_test.c → kronosnetd/vty_test.c
diff --git a/libvty/vty_utils.c → kronosnetd/vty_utils.c b/libvty/vty_utils.c → kronosnetd/vty_utils.c
diff --git a/libvty/vty_utils.h → kronosnetd/vty_utils.h b/libvty/vty_utils.h → kronosnetd/vty_utils.h
diff --git a/libvty/Makefile.am b/libvty/Makefile.am
diff --git a/libvty/libvty.pc.in b/libvty/libvty.pc.in
diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -23,24 +23,24 @@ check_PROGRAMS = \
 TESTS = $(check_PROGRAMS)
 
 AM_CPPFLAGS		= -DTEST \
-			  -I$(srcdir)/../ \
 			  -I$(srcdir)/../libtap/ \
 			  -I$(srcdir)/../libknet/ \
-			  -I$(srcdir)/../libvty/
+			  -I$(srcdir)/../kronosnetd/
 
 AM_LDFLAGS		= \
 			  $(top_builddir)/libtap/libtap.la \
-			  $(top_builddir)/libknet/libknet.a \
-			  $(top_builddir)/libvty/libvty.a
+			  $(top_builddir)/libknet/libknet.a 
 
 ping_test_SOURCES	= ping_test.c
 
 khandle_test_SOURCES	= khandle_test.c
 
-lookup_bench_SOURCES	= lookup_bench.c
+lookup_bench_SOURCES	= lookup_bench.c \
+			  $(srcdir)/../kronosnetd/netutils.c
 
 listener_test_SOURCES	= listener_test.c
 
-netutils_test_SOURCES	= netutils_test.c
+netutils_test_SOURCES	= netutils_test.c \
+			  $(srcdir)/../kronosnetd/netutils.c
 
 timediff_test_SOURCES	= timediff_test.c