diff options
| -rw-r--r-- | Makefile.am | 28 | ||||
| -rw-r--r-- | support/include/Makefile.am | 5 | ||||
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/nsm_client/Makefile.am | 1 | ||||
| -rw-r--r-- | utils/gssd/Makefile.am | 1 | ||||
| -rw-r--r-- | utils/idmapd/Makefile.am | 3 | ||||
| -rw-r--r-- | utils/mount/Makefile.am | 10 | ||||
| -rw-r--r-- | utils/mountd/Makefile.am | 1 | ||||
| -rw-r--r-- | utils/nfsd/Makefile.am | 1 | ||||
| -rw-r--r-- | utils/nfsdcltrack/Makefile.am | 2 | ||||
| -rw-r--r-- | utils/nfsidmap/Makefile.am | 2 | ||||
| -rw-r--r-- | utils/osd_login/Makefile.am | 2 | ||||
| -rw-r--r-- | utils/statd/Makefile.am | 4 |
13 files changed, 22 insertions, 39 deletions
diff --git a/Makefile.am b/Makefile.am index 5824adc..392e7b3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,34 +9,6 @@ MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = \ autogen.sh \ \ - debian/changelog \ - debian/control \ - debian/copyright \ - debian/etc.exports \ - debian/idmapd.conf \ - debian/nfs-common.conffiles \ - debian/nfs-common.default \ - debian/nfs-common.dirs \ - debian/nfs-common.files \ - debian/nfs-common.init \ - debian/nfs-common.install \ - debian/nfs-common.postinst \ - debian/nfs-common.postrm \ - debian/nfs-common.prerm \ - debian/nfs-kernel-server.NEWS \ - debian/nfs-kernel-server.conffiles \ - debian/nfs-kernel-server.default \ - debian/nfs-kernel-server.dirs \ - debian/nfs-kernel-server.init \ - debian/nfs-kernel-server.postinst \ - debian/nfs-kernel-server.postrm \ - debian/nfs-kernel-server.prerm \ - debian/nhfsstone.dirs \ - debian/nhfsstone.files \ - debian/nhfsstone.postinst \ - debian/nhfsstone.prerm \ - debian/rules \ - \ aclocal/bsdsignals.m4 \ aclocal/nfs-utils.m4 \ aclocal/kerberos5.m4 \ diff --git a/support/include/Makefile.am b/support/include/Makefile.am index 4b33ee9..5c80c8b 100644 --- a/support/include/Makefile.am +++ b/support/include/Makefile.am @@ -3,6 +3,7 @@ SUBDIRS = nfs rpcsvc sys noinst_HEADERS = \ + cld.h \ exportfs.h \ ha-callout.h \ misc.h \ @@ -10,9 +11,13 @@ noinst_HEADERS = \ nfs_paths.h \ nfslib.h \ nfsrpc.h \ + nls.h \ nsm.h \ + pseudoflavors.h \ rpcmisc.h \ + sockaddr.h \ tcpwrapper.h \ + v4root.h \ xio.h \ xlog.h \ xmalloc.h \ diff --git a/tests/Makefile.am b/tests/Makefile.am index faa8197..1f96264 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -11,3 +11,4 @@ SUBDIRS = nsm_client MAINTAINERCLEANFILES = Makefile.in TESTS = t0001-statd-basic-mon-unmon.sh +EXTRA_DIST = test-lib.sh $(TESTS) diff --git a/tests/nsm_client/Makefile.am b/tests/nsm_client/Makefile.am index 4c15346..a8fc131 100644 --- a/tests/nsm_client/Makefile.am +++ b/tests/nsm_client/Makefile.am @@ -7,6 +7,7 @@ GENFILES_H = nlm_sm_inter.h GENFILES = $(GENFILES_CLNT) $(GENFILES_SVC) $(GENFILES_XDR) $(GENFILES_H) +EXTRA_DIST = nlm_sm_inter.x check_PROGRAMS = nsm_client nsm_client_SOURCES = $(GENFILES) nsm_client.c diff --git a/utils/gssd/Makefile.am b/utils/gssd/Makefile.am index 9835117..693fb0b 100644 --- a/utils/gssd/Makefile.am +++ b/utils/gssd/Makefile.am @@ -15,7 +15,6 @@ endif sbin_PROGRAMS = $(sbin_PREFIXED) EXTRA_DIST = \ - gss_destroy_creds \ $(man8_MANS) COMMON_SRCS = \ diff --git a/utils/idmapd/Makefile.am b/utils/idmapd/Makefile.am index 58b33ec..c2f8ba1 100644 --- a/utils/idmapd/Makefile.am +++ b/utils/idmapd/Makefile.am @@ -7,8 +7,7 @@ KPREFIX = @kprefix@ sbin_PROGRAMS = idmapd EXTRA_DIST = \ - $(man8_MANS) \ - idmapd.conf + $(man8_MANS) idmapd_SOURCES = \ idmapd.c \ diff --git a/utils/mount/Makefile.am b/utils/mount/Makefile.am index 5810936..e24f3bd 100644 --- a/utils/mount/Makefile.am +++ b/utils/mount/Makefile.am @@ -8,19 +8,21 @@ man8_MANS = mount.nfs.man umount.nfs.man man5_MANS = nfs.man sbin_PROGRAMS = mount.nfs -EXTRA_DIST = nfsmount.x $(man8_MANS) $(man5_MANS) +EXTRA_DIST = nfsmount.conf $(man8_MANS) $(man5_MANS) mount_common = error.c network.c token.c \ parse_opt.c parse_dev.c \ nfsmount.c nfs4mount.c stropts.c\ mount_constants.h error.h network.h token.h \ parse_opt.h parse_dev.h \ - nfs4_mount.h nfs_mount4.h stropts.h version.h \ - mount_config.h utils.c utils.h + nfs4_mount.h stropts.h version.h \ + mount_config.h utils.c utils.h \ + nfs_mount.h if MOUNT_CONFIG mount_common += configfile.c man5_MANS += nfsmount.conf.man -EXTRA_DIST += nfsmount.conf +else +EXTRA_DIST += nfsmount.conf.man endif mount_nfs_LDADD = ../../support/nfs/libnfs.a \ diff --git a/utils/mountd/Makefile.am b/utils/mountd/Makefile.am index 7db968b..9e1ab5c 100644 --- a/utils/mountd/Makefile.am +++ b/utils/mountd/Makefile.am @@ -7,6 +7,7 @@ RPCPREFIX = rpc. KPREFIX = @kprefix@ sbin_PROGRAMS = mountd +noinst_HEADERS = fsloc.h mountd_SOURCES = mountd.c mount_dispatch.c auth.c rmtab.c cache.c \ svc_run.c fsloc.c v4root.c mountd.h mountd_LDADD = ../../support/export/libexport.a \ diff --git a/utils/nfsd/Makefile.am b/utils/nfsd/Makefile.am index 1536065..39a6e6f 100644 --- a/utils/nfsd/Makefile.am +++ b/utils/nfsd/Makefile.am @@ -7,6 +7,7 @@ RPCPREFIX = rpc. KPREFIX = @kprefix@ sbin_PROGRAMS = nfsd +noinst_HEADERS = nfssvc.h nfsd_SOURCES = nfsd.c nfssvc.c nfsd_LDADD = ../../support/nfs/libnfs.a $(LIBTIRPC) diff --git a/utils/nfsdcltrack/Makefile.am b/utils/nfsdcltrack/Makefile.am index 7524295..0a2858f 100644 --- a/utils/nfsdcltrack/Makefile.am +++ b/utils/nfsdcltrack/Makefile.am @@ -10,6 +10,8 @@ EXTRA_DIST = $(man8_MANS) AM_CFLAGS += -D_LARGEFILE64_SOURCE sbin_PROGRAMS = nfsdcltrack +noinst_HEADERS = sqlite.h + nfsdcltrack_SOURCES = nfsdcltrack.c sqlite.c nfsdcltrack_LDADD = ../../support/nfs/libnfs.a $(LIBSQLITE) $(LIBCAP) diff --git a/utils/nfsidmap/Makefile.am b/utils/nfsidmap/Makefile.am index 737a219..91cedfd 100644 --- a/utils/nfsidmap/Makefile.am +++ b/utils/nfsidmap/Makefile.am @@ -7,4 +7,4 @@ nfsidmap_SOURCES = nfsidmap.c nfsidmap_LDADD = $(LIBNFSIDMAP) -lkeyutils ../../support/nfs/libnfs.a MAINTAINERCLEANFILES = Makefile.in -EXTRA_DIST = id_resolver.conf +EXTRA_DIST = id_resolver.conf $(man8_MANS) diff --git a/utils/osd_login/Makefile.am b/utils/osd_login/Makefile.am index 20c2d8c..ded1fd3 100644 --- a/utils/osd_login/Makefile.am +++ b/utils/osd_login/Makefile.am @@ -4,6 +4,6 @@ # overridden at config time. sbindir = /sbin -sbin_SCRIPTS = osd_login +dist_sbin_SCRIPTS = osd_login MAINTAINERCLEANFILES = Makefile.in diff --git a/utils/statd/Makefile.am b/utils/statd/Makefile.am index dc2bfc4..152b680 100644 --- a/utils/statd/Makefile.am +++ b/utils/statd/Makefile.am @@ -8,7 +8,7 @@ sbin_PROGRAMS = statd sm-notify dist_sbin_SCRIPTS = start-statd statd_SOURCES = callback.c notlist.c misc.c monitor.c hostname.c \ simu.c stat.c statd.c svc_run.c rmtcall.c \ - notlist.h statd.h system.h version.h + notlist.h statd.h system.h sm_notify_SOURCES = sm-notify.c BUILT_SOURCES = $(GENFILES) @@ -20,7 +20,7 @@ sm_notify_LDADD = ../../support/nsm/libnsm.a \ ../../support/nfs/libnfs.a \ $(LIBNSL) $(LIBCAP) $(LIBTIRPC) -EXTRA_DIST = sim_sm_inter.x $(man8_MANS) COPYRIGHT simulate.c +EXTRA_DIST = sim_sm_inter.x $(man8_MANS) simulate.c if CONFIG_RPCGEN RPCGEN = $(top_builddir)/tools/rpcgen/rpcgen |