merged in the fixes_for_2.0.4 branch

diff --git a/client/Makefile.am b/client/Makefile.am
index 6c48198..61525a1 100644 (file)
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -6,7 +6,7 @@ fwknop_SOURCES      = fwknop.c fwknop.h config_init.c config_init.h \
 
 fwknop_CPPFLAGS     = -I $(top_srcdir)/lib -I $(top_srcdir)/common
 
-fwknop_LDADD        = $(top_builddir)/lib/libfko.la $(top_builddir)/lib/libfko_util.a
+fwknop_LDADD        = $(top_builddir)/lib/libfko.la $(top_builddir)/common/libfko_util.a
 
 dist_man_MANS       = fwknop.8
 

diff --git a/common/Makefile.am b/common/Makefile.am
index 6eb7b45..4924f53 100644 (file)
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1 +1,9 @@
+noinst_LIBRARIES               = libfko_util.a
+
+libfko_util_source_files       = ../lib/strlcpy.c ../lib/strlcat.c ../lib/fko_util.h
+
+libfko_util_a_SOURCES          = $(libfko_util_source_files)
+
+AM_CPPFLAGS                    = $(GPGME_CFLAGS) -I $(top_srcdir)/common
+
 EXTRA_DIST = common.h netinet_common.h

diff --git a/lib/Makefile.am b/lib/Makefile.am
index ad9e3f0..099b778 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -6,22 +6,13 @@ libfko_source_files = \
     fko_decode.c fko_encryption.c fko_error.c fko_funcs.c fko_message.c \
     fko_message.h fko_nat_access.c fko_rand_value.c fko_server_auth.c \
     fko.h fko_limits.h fko_timestamp.c fko_hmac.c hmac.c hmac.h \
-    fko_user.c fko_user.h fko_util.c fko_util.h md5.c md5.h rijndael.c \
-    rijndael.h sha1.c sha1.h sha2.c sha2.h fko_state.h \
-    fko_context.h gpgme_funcs.c gpgme_funcs.h
+    fko_user.c fko_user.h md5.c md5.h rijndael.c rijndael.h sha1.c \
+    sha1.h sha2.c sha2.h fko_context.h fko_state.h fko_context.h \
+    gpgme_funcs.c gpgme_funcs.h strlcpy.c strlcat.c fko_util.c fko_util.h
 
 libfko_la_SOURCES              = $(libfko_source_files)
-libfko_la_LIBADD               = 
-libfko_la_DEPENDENCIES         = strlcpy.lo strlcat.lo
 libfko_la_LDFLAGS              = -version-info 1:0:0 $(GPGME_LIBS) -export-symbols-regex '^fko_'
 
-libfko_util_source_files       = strlcpy.c strlcat.c fko_util.h
-libfko_util_a_SOURCES          = $(libfko_util_source_files)
-libfko_util_a_LIBADD           = 
-libfko_util_a_DEPENDENCIES  = strlcpy.lo strlcat.lo
-
-noinst_LIBRARIES               = libfko_util.a
-
 AM_CPPFLAGS                    = $(GPGME_CFLAGS) -I $(top_srcdir)/common
 
 include_HEADERS                = fko.h

diff --git a/server/Makefile.am b/server/Makefile.am
index 5de7155..fc321ba 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -12,7 +12,7 @@ fwknopd_SOURCES   = fwknopd.c fwknopd.h config_init.c config_init.h \
                     fw_util_ipfw.c fw_util_ipfw.h \
                     fw_util_pf.c fw_util_pf.h cmd_opts.h
 
-fwknopd_LDADD     = $(top_builddir)/lib/libfko.la $(top_builddir)/lib/libfko_util.a -lpcap
+fwknopd_LDADD     = $(top_builddir)/lib/libfko.la $(top_builddir)/common/libfko_util.a -lpcap
 
 if ! CONFIG_FILE_CACHE
 if USE_NDBM