continuing refactoring of regex library structure, disambiguating symbol names between old regex library which is now internal and the public API; moving IP-to-regex conversion functions to tun library, as only vpn is using those to begin with

1 files changed, 12 insertions, 4 deletions

diff --git a/src/tun/Makefile.am b/src/tun/Makefile.am
index 3b2b573b6..96e79d0d8 100644
--- a/src/tun/Makefile.am
+++ b/src/tun/Makefile.am
@@ -12,18 +12,19 @@ endif
 lib_LTLIBRARIES = libgnunettun.la
 
 libgnunettun_la_SOURCES = \
-  tun.c
+  tun.c \
+  regex.c
 libgnunettun_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la $(XLIB) \
  $(LTLIBINTL)
 libgnunettun_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
-  -version-info 0:0:0
+  -version-info 1:0:1
 
 
 check_PROGRAMS = \
- test_tun
-
+ test_tun \
+ test_regex
 
 if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
@@ -34,3 +35,10 @@ test_tun_SOURCES = \
 test_tun_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/tun/libgnunettun.la
+
+
+test_regex_SOURCES = \
+ test_regex.c
+test_regex_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/tun/libgnunettun.la