build: Move stuff to be shared to lib/ (nvt_log, socket)

.gitignore

@@ -3,10 +3,12 @@
 /autom4te.cache/
 /compile
 /config.h.in
-/config.h.in~
+/config.guess
+/config.sub
 /configure
 /depcomp
 /install-sh
+/ltmain.sh
 /missing
 Makefile.in
 

Makefile.am

@@ -4,4 +4,4 @@ MAINTAINERCLEANFILES = \
 	depcomp install-sh missing \
 	Makefile.in */Makefile.in
 
-SUBDIRS = src
+SUBDIRS = lib src

configure.ac

@@ -13,6 +13,8 @@ define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
 define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
 define([AC_LIBTOOL_LANG_GCJ_CONFIG], [:])dnl
 
+LT_INIT()
+
 AC_C_BIGENDIAN
 AC_C_CONST
 AC_C_INLINE
@@ -33,6 +35,7 @@ AC_SUBST(CFLAGS_WARN)
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([
 Makefile
+lib/Makefile
 src/Makefile
 ])
 AC_OUTPUT

lib/Makefile.am

@@ -0,0 +1,6 @@
+noinst_LTLIBRARIES = libnvt.la
+
+libnvt_la_CFLAGS = $(CFLAGS_WARN)
+
+libnvt_la_SOURCES  = nvt_log.c nvt_log.h
+libnvt_la_SOURCES += nvt_socket.c nvt_socket.h

src/Makefile.am

@@ -3,10 +3,8 @@ bin_PROGRAMS = ttynvt
 
 ttynvt_SOURCES = \
 	ttynvt.c \
-	nvt_log.c nvt_log.h \
-	nvt_socket.c nvt_socket.h \
 	telnet_basic.c telnet_rfc2217.c telnet.h telnet_param.h
 
-ttynvt_CPPFLAGS = -I$(top_builddir) $(FUSE_CFLAGS) $(CFLAGS_WARN)
+ttynvt_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(FUSE_CFLAGS) $(CFLAGS_WARN)
 
-ttynvt_LDADD = $(FUSE_LIBS)
+ttynvt_LDADD = $(top_builddir)/lib/libnvt.la $(FUSE_LIBS)

src/ttynvt.c

@@ -24,8 +24,8 @@
 #include <netinet/in.h>
 #include <sys/ioctl.h>
 
-#include "nvt_log.h"
+#include "lib/nvt_log.h"
-#include "nvt_socket.h"
+#include "lib/nvt_socket.h"
 #include "telnet.h"
 
 #define NET_BUF_SIZE 1024