From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: linux-nfs-owner@vger.kernel.org Received: from cantor2.suse.de ([195.135.220.15]:37137 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752110AbaKEDFb (ORCPT ); Tue, 4 Nov 2014 22:05:31 -0500 Date: Wed, 5 Nov 2014 14:05:20 +1100 From: NeilBrown To: Steve Dickson Cc: NFS Subject: [nfs-utils PATCH 1/2] Fix up issue with "make dist" Message-ID: <20141105140520.7759b0ac@notabene.brown> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/.QdJndzcasv4XxAA.AKUoJm"; protocol="application/pgp-signature" Sender: linux-nfs-owner@vger.kernel.org List-ID: --Sig_/.QdJndzcasv4XxAA.AKUoJm Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Add mention of new files, remove mention of old files, and cause "make dist" to create something very similar to the current distributions. systemd files are not currently included in "make dist" and some files generated by "rpcgen" are (though they aren't in official distribution). Signed-off-by: NeilBrown --- Makefile.am | 28 ---------------------------- support/include/Makefile.am | 5 +++++ tests/Makefile.am | 1 + tests/nsm_client/Makefile.am | 1 + utils/gssd/Makefile.am | 1 - utils/idmapd/Makefile.am | 3 +-- utils/mount/Makefile.am | 10 ++++++---- utils/mountd/Makefile.am | 1 + utils/nfsd/Makefile.am | 1 + utils/nfsdcltrack/Makefile.am | 2 ++ utils/nfsidmap/Makefile.am | 2 +- utils/osd_login/Makefile.am | 2 +- utils/statd/Makefile.am | 4 ++-- 13 files changed, 22 insertions(+), 39 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5824adc828a9..392e7b364359 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,34 +9,6 @@ MAINTAINERCLEANFILES =3D Makefile.in EXTRA_DIST =3D \ 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 4b33ee92915e..5c80c8bfa6f5 100644 --- a/support/include/Makefile.am +++ b/support/include/Makefile.am @@ -3,6 +3,7 @@ SUBDIRS =3D nfs rpcsvc sys =20 noinst_HEADERS =3D \ + cld.h \ exportfs.h \ ha-callout.h \ misc.h \ @@ -10,9 +11,13 @@ noinst_HEADERS =3D \ 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 faa8197973be..1f962645ab73 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -11,3 +11,4 @@ SUBDIRS =3D nsm_client MAINTAINERCLEANFILES =3D Makefile.in =20 TESTS =3D t0001-statd-basic-mon-unmon.sh +EXTRA_DIST =3D test-lib.sh $(TESTS) diff --git a/tests/nsm_client/Makefile.am b/tests/nsm_client/Makefile.am index 4c153460dfb4..a8fc1315fe22 100644 --- a/tests/nsm_client/Makefile.am +++ b/tests/nsm_client/Makefile.am @@ -7,6 +7,7 @@ GENFILES_H =3D nlm_sm_inter.h =20 GENFILES =3D $(GENFILES_CLNT) $(GENFILES_SVC) $(GENFILES_XDR) $(GENFILES_H) =20 +EXTRA_DIST =3D nlm_sm_inter.x =20 check_PROGRAMS =3D nsm_client nsm_client_SOURCES =3D $(GENFILES) nsm_client.c diff --git a/utils/gssd/Makefile.am b/utils/gssd/Makefile.am index 98351177be0e..693fb0bb68b6 100644 --- a/utils/gssd/Makefile.am +++ b/utils/gssd/Makefile.am @@ -15,7 +15,6 @@ endif sbin_PROGRAMS =3D $(sbin_PREFIXED) =20 EXTRA_DIST =3D \ - gss_destroy_creds \ $(man8_MANS) =20 COMMON_SRCS =3D \ diff --git a/utils/idmapd/Makefile.am b/utils/idmapd/Makefile.am index 58b33ece4fcd..c2f8ba1ca672 100644 --- a/utils/idmapd/Makefile.am +++ b/utils/idmapd/Makefile.am @@ -7,8 +7,7 @@ KPREFIX =3D @kprefix@ sbin_PROGRAMS =3D idmapd =20 EXTRA_DIST =3D \ - $(man8_MANS) \ - idmapd.conf + $(man8_MANS) =20 idmapd_SOURCES =3D \ idmapd.c \ diff --git a/utils/mount/Makefile.am b/utils/mount/Makefile.am index 581093689398..e24f3bd24b1b 100644 --- a/utils/mount/Makefile.am +++ b/utils/mount/Makefile.am @@ -8,19 +8,21 @@ man8_MANS =3D mount.nfs.man umount.nfs.man man5_MANS =3D nfs.man =20 sbin_PROGRAMS =3D mount.nfs -EXTRA_DIST =3D nfsmount.x $(man8_MANS) $(man5_MANS) +EXTRA_DIST =3D nfsmount.conf $(man8_MANS) $(man5_MANS) mount_common =3D 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 =20 if MOUNT_CONFIG mount_common +=3D configfile.c man5_MANS +=3D nfsmount.conf.man -EXTRA_DIST +=3D nfsmount.conf +else +EXTRA_DIST +=3D nfsmount.conf.man endif =20 mount_nfs_LDADD =3D ../../support/nfs/libnfs.a \ diff --git a/utils/mountd/Makefile.am b/utils/mountd/Makefile.am index 7db968b91b70..9e1ab5c49625 100644 --- a/utils/mountd/Makefile.am +++ b/utils/mountd/Makefile.am @@ -7,6 +7,7 @@ RPCPREFIX =3D rpc. KPREFIX =3D @kprefix@ sbin_PROGRAMS =3D mountd =20 +noinst_HEADERS =3D fsloc.h mountd_SOURCES =3D mountd.c mount_dispatch.c auth.c rmtab.c cache.c \ svc_run.c fsloc.c v4root.c mountd.h mountd_LDADD =3D ../../support/export/libexport.a \ diff --git a/utils/nfsd/Makefile.am b/utils/nfsd/Makefile.am index 1536065813af..39a6e6f2d1cd 100644 --- a/utils/nfsd/Makefile.am +++ b/utils/nfsd/Makefile.am @@ -7,6 +7,7 @@ RPCPREFIX =3D rpc. KPREFIX =3D @kprefix@ sbin_PROGRAMS =3D nfsd =20 +noinst_HEADERS =3D nfssvc.h nfsd_SOURCES =3D nfsd.c nfssvc.c nfsd_LDADD =3D ../../support/nfs/libnfs.a $(LIBTIRPC) =20 diff --git a/utils/nfsdcltrack/Makefile.am b/utils/nfsdcltrack/Makefile.am index 7524295f394e..0a2858f1e0f3 100644 --- a/utils/nfsdcltrack/Makefile.am +++ b/utils/nfsdcltrack/Makefile.am @@ -10,6 +10,8 @@ EXTRA_DIST =3D $(man8_MANS) AM_CFLAGS +=3D -D_LARGEFILE64_SOURCE sbin_PROGRAMS =3D nfsdcltrack =20 +noinst_HEADERS =3D sqlite.h + nfsdcltrack_SOURCES =3D nfsdcltrack.c sqlite.c nfsdcltrack_LDADD =3D ../../support/nfs/libnfs.a $(LIBSQLITE) $(LIBCAP) =20 diff --git a/utils/nfsidmap/Makefile.am b/utils/nfsidmap/Makefile.am index 737a21982a04..91cedfdfc78f 100644 --- a/utils/nfsidmap/Makefile.am +++ b/utils/nfsidmap/Makefile.am @@ -7,4 +7,4 @@ nfsidmap_SOURCES =3D nfsidmap.c nfsidmap_LDADD =3D $(LIBNFSIDMAP) -lkeyutils ../../support/nfs/libnfs.a =20 MAINTAINERCLEANFILES =3D Makefile.in -EXTRA_DIST =3D id_resolver.conf +EXTRA_DIST =3D id_resolver.conf $(man8_MANS) diff --git a/utils/osd_login/Makefile.am b/utils/osd_login/Makefile.am index 20c2d8c9027f..ded1fd308608 100644 --- a/utils/osd_login/Makefile.am +++ b/utils/osd_login/Makefile.am @@ -4,6 +4,6 @@ # overridden at config time. sbindir =3D /sbin =20 -sbin_SCRIPTS =3D osd_login +dist_sbin_SCRIPTS =3D osd_login =20 MAINTAINERCLEANFILES =3D Makefile.in diff --git a/utils/statd/Makefile.am b/utils/statd/Makefile.am index dc2bfc4e3697..152b6806d29b 100644 --- a/utils/statd/Makefile.am +++ b/utils/statd/Makefile.am @@ -8,7 +8,7 @@ sbin_PROGRAMS =3D statd sm-notify dist_sbin_SCRIPTS =3D start-statd statd_SOURCES =3D 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 =3D sm-notify.c =20 BUILT_SOURCES =3D $(GENFILES) @@ -20,7 +20,7 @@ sm_notify_LDADD =3D ../../support/nsm/libnsm.a \ ../../support/nfs/libnfs.a \ $(LIBNSL) $(LIBCAP) $(LIBTIRPC) =20 -EXTRA_DIST =3D sim_sm_inter.x $(man8_MANS) COPYRIGHT simulate.c +EXTRA_DIST =3D sim_sm_inter.x $(man8_MANS) simulate.c =20 if CONFIG_RPCGEN RPCGEN =3D $(top_builddir)/tools/rpcgen/rpcgen --=20 2.1.1 --Sig_/.QdJndzcasv4XxAA.AKUoJm Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIVAwUBVFmT8Dnsnt1WYoG5AQLVeg/+JulPFA+9XFqKQ7uuBb2C3RHc+YIMPyW8 0g4MyYTjX8gB0vv752ALSJ2jV26cWVBpCKGigYsG8TfP1xdeBcnYjrwsccPsXgN1 nu8hxtbMQ9lEaULqfOL3uSV8K5HcdMMA1mkEgcYstGaKfLNR8uG6onnQaITy4Fgf h9cVKYtRNXqmzsKQrIxSoadA8nPu/J5Fn8BbRTkd13JovKo5XEhsoI49CkkJo+TD Y1lmAmgZkTXP7m5WvxX+eYXoUFJLEjpuBnJOnROtVw9FqqI1KnO6u+pIedYEwfrX dgAQJdMhHx7jUCwgsxAw9WsQMQCO4JMAcz1LxkEvX+OXO/30e4w7pCXo2JsDTJJv 9HoUAcNEuA9PYkgDcQAagaunHCKbDWfdxfu/00O+jpUxqkvyZ7KitI+C7XdOEWTp h7Ij9vn3d6zfv5JxKfVzTCYHXB0CP87YXEecBkzxTF3ZVTrZOhwAXyPnZXZUWHm9 S5kerIbwM8qXBYnkgIodIcnsxO4ZhMtqH8149dV32uh7WYyzSrJd/5dsVNGR21Ci rRm2XN5IuYIgTVWzsCmOCBYSNXI1Ur6IyI2KXMZtOstu9yw2ozi8exSVy0noyHAw dca1YoE1LShbowaVC9ysUr+uM9SE/fj8nrthVClmDuuBwikslpTyT1BE8X8EjG7i UK+tGiTb0Ug= =32IZ -----END PGP SIGNATURE----- --Sig_/.QdJndzcasv4XxAA.AKUoJm--