@@ -21,7 +21,10 @@ noinst_HEADERS = \
xio.h \
xlog.h \
xmalloc.h \
- xcommon.h \
+ xcommon.h
+
+include_HEADERS = \
conffile.h
+
MAINTAINERCLEANFILES = Makefile.in
@@ -4,8 +4,14 @@ noinst_LIBRARIES = libnfs.a
libnfs_a_SOURCES = exports.c rmtab.c xio.c rpcmisc.c rpcdispatch.c \
xlog.c xcommon.c wildmat.c mydaemon.c \
rpc_socket.c getport.c \
- svc_socket.c cacheio.c closeall.c nfs_mntent.c conffile.c \
+ svc_socket.c cacheio.c closeall.c nfs_mntent.c \
svc_create.c atomicio.c strlcpy.c strlcat.c
+libnfs_a_CFLAGS = -fPIC
+
+lib_LTLIBRARIES = libnfsconf.la
+libnfsconf_la_SOURCES = conffile.c
+libnfsconf_la_LIBADD = libnfs.a
+
MAINTAINERCLEANFILES = Makefile.in
@@ -53,8 +53,6 @@
#include "conffile.h"
#include "xlog.h"
-#pragma GCC visibility push(hidden)
-
static void conf_load_defaults(void);
static char * conf_load(const char *path);
static int conf_set(int , const char *, const char *, const char *,
@@ -74,7 +72,7 @@ struct conf_trans {
int is_default;
};
-TAILQ_HEAD (conf_trans_head, conf_trans) conf_trans_queue;
+static TAILQ_HEAD (conf_trans_head, conf_trans) conf_trans_queue;
/*
* Radix-64 Encoding.
@@ -13,7 +13,8 @@ blkmapd_SOURCES = \
dm-device.c \
device-discovery.h
-blkmapd_LDADD = -ldevmapper ../../support/nfs/libnfs.a
+blkmapd_LDADD = -ldevmapper ../../support/nfs/libnfs.a \
+ -L../../support/nfs/ -lnfsconf
MAINTAINERCLEANFILES = Makefile.in
@@ -10,6 +10,7 @@ exportfs_SOURCES = exportfs.c
exportfs_LDADD = ../../support/export/libexport.a \
../../support/nfs/libnfs.a \
../../support/misc/libmisc.a \
+ -L../../support/nfs/ -lnfsconf \
$(LIBWRAP) $(LIBNSL)
MAINTAINERCLEANFILES = Makefile.in
@@ -45,6 +45,7 @@ gssd_SOURCES = \
gssd_LDADD = \
../../support/nfs/libnfs.a \
+ -L../../support/nfs/ -lnfsconf \
$(LIBEVENT) \
$(RPCSECGSS_LIBS) \
$(KRBLIBS) \
@@ -75,6 +76,7 @@ svcgssd_SOURCES = \
svcgssd_LDADD = \
../../support/nfs/libnfs.a \
+ -L../../support/nfs/ -lnfsconf \
$(RPCSECGSS_LIBS) $(LIBNFSIDMAP) \
$(KRBLIBS) $(GSSAPI_LIBS) $(LIBTIRPC)
@@ -27,6 +27,7 @@ endif
mount_nfs_LDADD = ../../support/nfs/libnfs.a \
../../support/export/libexport.a \
+ -L../../support/nfs/ -lnfsconf \
$(LIBTIRPC)
mount_nfs_SOURCES = $(mount_common)
@@ -13,6 +13,7 @@ mountd_SOURCES = mountd.c mount_dispatch.c auth.c rmtab.c cache.c \
mountd_LDADD = ../../support/export/libexport.a \
../../support/nfs/libnfs.a \
../../support/misc/libmisc.a \
+ -L../../support/nfs/ -lnfsconf \
$(LIBBSD) $(LIBWRAP) $(LIBNSL) $(LIBBLKID) $(LIBDL) $(LIBTIRPC)
mountd_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) \
-I$(top_builddir)/support/include \
@@ -9,7 +9,8 @@ sbin_PROGRAMS = nfsd
noinst_HEADERS = nfssvc.h
nfsd_SOURCES = nfsd.c nfssvc.c
-nfsd_LDADD = ../../support/nfs/libnfs.a $(LIBTIRPC)
+nfsd_LDADD = ../../support/nfs/libnfs.a $(LIBTIRPC) \
+ -L../../support/nfs/ -lnfsconf
MAINTAINERCLEANFILES = Makefile.in
@@ -13,7 +13,8 @@ sbin_PROGRAMS = nfsdcltrack
noinst_HEADERS = sqlite.h
nfsdcltrack_SOURCES = nfsdcltrack.c sqlite.c
-nfsdcltrack_LDADD = ../../support/nfs/libnfs.a $(LIBSQLITE) $(LIBCAP)
+nfsdcltrack_LDADD = ../../support/nfs/libnfs.a $(LIBSQLITE) $(LIBCAP) \
+ -L../../support/nfs/ -lnfsconf
MAINTAINERCLEANFILES = Makefile.in
@@ -15,10 +15,12 @@ BUILT_SOURCES = $(GENFILES)
statd_LDADD = ../../support/nsm/libnsm.a \
../../support/nfs/libnfs.a \
../../support/misc/libmisc.a \
+ -L../../support/nfs/ -lnfsconf \
$(LIBWRAP) $(LIBNSL) $(LIBCAP) $(LIBTIRPC)
sm_notify_LDADD = ../../support/nsm/libnsm.a \
../../support/nfs/libnfs.a \
../../support/misc/libmisc.a \
+ -L../../support/nfs/ -lnfsconf \
$(LIBNSL) $(LIBCAP) $(LIBTIRPC)
EXTRA_DIST = sim_sm_inter.x $(man8_MANS) simulate.c
Move the config handling code that is common to all nfs-utils and make it a shared library so that other projects like libnfsidmap can also use it. No attempt is made to improve the API at this point so as to minimize the change size. Signed-off-by: Justin Mitchell <jumitche@redhat.com> --- support/include/Makefile.am | 5 ++++- support/nfs/Makefile.am | 8 +++++++- support/nfs/conffile.c | 4 +--- utils/blkmapd/Makefile.am | 3 ++- utils/exportfs/Makefile.am | 1 + utils/gssd/Makefile.am | 2 ++ utils/mount/Makefile.am | 1 + utils/mountd/Makefile.am | 1 + utils/nfsd/Makefile.am | 3 ++- utils/nfsdcltrack/Makefile.am | 3 ++- utils/statd/Makefile.am | 2 ++ 11 files changed, 25 insertions(+), 8 deletions(-)