spell out message types more, use correct conversion direction

[oweals/gnunet.git] / src / tun / Makefile.am

diff --git a/src/tun/Makefile.am b/src/tun/Makefile.am
index 31de64667a8f265684537910c5a4913fd56089a2..c741f5654d4de97cb038d5551e3c004c17b1d646 100644 (file)
--- a/src/tun/Makefile.am
+++ b/src/tun/Makefile.am
@@ -1,4 +1,5 @@
-INCLUDES = -I$(top_srcdir)/src/include
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
@@ -12,18 +13,22 @@ endif
 lib_LTLIBRARIES = libgnunettun.la
 
 libgnunettun_la_SOURCES = \
-  tun.c
+  tun.c \
+  regex.c
 libgnunettun_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
+ $(top_builddir)/src/util/libgnunetutil.la $(XLIB) \
+ $(LTLIBINTL)
 libgnunettun_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)
+  $(GN_LIB_LDFLAGS) \
+  -version-info 1:0:1
 
 
 check_PROGRAMS = \
- test_tun
-
+ test_tun \
+ test_regex
 
 if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 
@@ -31,4 +36,11 @@ test_tun_SOURCES = \
  test_tun.c
 test_tun_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/tun/libgnunettun.la
+ libgnunettun.la
+
+
+test_regex_SOURCES = \
+ test_regex.c
+test_regex_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettun.la