Limited exported symbols in libfko to only the public (fko_) functions. Moved strlcat...

diff --git a/client/Makefile.am b/client/Makefile.am
index 61fe439..6c48198 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
+fwknop_LDADD        = $(top_builddir)/lib/libfko.la $(top_builddir)/lib/libfko_util.a
 
 dist_man_MANS       = fwknop.8
 

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 85c0bd3..5e03c4b 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -5,14 +5,18 @@ libfko_source_files = \
     fko_client_timeout.c fko_common.h fko_digest.c fko_encode.c \
     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_user.c fko_user.h fko_util.h \
-    md5.c md5.h rijndael.c rijndael.h sha1.c sha1.h sha2.c sha2.h strlcat.c \
-    strlcpy.c fko_context.h fko_state.h fko_context.h gpgme_funcs.c \
+    fko.h fko_limits.h fko_timestamp.c 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
 
 libfko_la_SOURCES   = $(libfko_source_files)
+libfko_la_LIBADD    = libfko_util.a
+libfko_la_LDFLAGS   = -version-info 0:4:0 $(GPGME_LIBS) -export-symbols-regex '^fko_'
 
-libfko_la_LDFLAGS   = -version-info 0:4:0 $(GPGME_LIBS)
+noinst_LIBRARIES         = libfko_util.a
+libfko_util_source_files = strlcpy.c strlcat.c fko_util.h
+libfko_util_a_SOURCES    = $(libfko_util_source_files)
 
 AM_CPPFLAGS         = $(GPGME_CFLAGS) -I $(top_srcdir)/common
 

diff --git a/server/Makefile.am b/server/Makefile.am
index a61a17e..5de7155 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 -lpcap
+fwknopd_LDADD     = $(top_builddir)/lib/libfko.la $(top_builddir)/lib/libfko_util.a -lpcap
 
 if ! CONFIG_FILE_CACHE
 if USE_NDBM