[PATCH] nilfs-utils: fix build of dist archives

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The following files are missing in the archive files generated by
"make dist-*":

 - .gitignore files
 - autogen.sh script
 - checkpatch.pl script

This fixes the issue.

Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
---
 Makefile.am                   |    6 +++++-
 bin/Makefile.am               |    2 ++
 configure.ac                  |    3 ++-
 sbin/cleanerd/Makefile.am     |    2 ++
 sbin/mkfs/Makefile.am         |    2 ++
 sbin/mount/Makefile.am        |    2 ++
 sbin/nilfs-clean/Makefile.am  |    2 ++
 sbin/nilfs-resize/Makefile.am |    2 ++
 sbin/nilfs-tune/Makefile.am   |    2 ++
 scripts/Makefile.am           |    3 +++
 10 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 scripts/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3643e32..cf79a43 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,4 +2,8 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = lib bin sbin include man
+SUBDIRS = lib bin sbin include man scripts
+
+dist_noinst_SCRIPTS = autogen.sh
+
+EXTRA_DIST = .gitignore m4/.gitignore
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 32b6ee8..6623022 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -20,3 +20,5 @@ mkcp_LDADD = $(LDADD) $(LIB_POSIX_SEM)
 
 rmcp_SOURCES = rmcp.c
 rmcp_LDADD = $(LDADD) $(top_builddir)/lib/libcno.la
+
+EXTRA_DIST = .gitignore
diff --git a/configure.ac b/configure.ac
index dbb9d9f..fcb86a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,5 +181,6 @@ AC_CONFIG_FILES([Makefile
 		 sbin/mount/Makefile
 		 sbin/nilfs-tune/Makefile
 		 sbin/nilfs-clean/Makefile
-		 sbin/nilfs-resize/Makefile])
+		 sbin/nilfs-resize/Makefile
+		 scripts/Makefile])
 AC_OUTPUT
diff --git a/sbin/cleanerd/Makefile.am b/sbin/cleanerd/Makefile.am
index cce16d6..0f68670 100644
--- a/sbin/cleanerd/Makefile.am
+++ b/sbin/cleanerd/Makefile.am
@@ -11,3 +11,5 @@ nilfs_cleanerd_CPPFLAGS = -I$(top_srcdir)/include \
 	-DSYSCONFDIR=\"$(sysconfdir)\"
 
 dist_sysconf_DATA = nilfs_cleanerd.conf
+
+EXTRA_DIST = .gitignore
diff --git a/sbin/mkfs/Makefile.am b/sbin/mkfs/Makefile.am
index f7d45b1..7b9af04 100644
--- a/sbin/mkfs/Makefile.am
+++ b/sbin/mkfs/Makefile.am
@@ -9,3 +9,5 @@ LDADD = -luuid $(LIB_BLKID) $(top_builddir)/lib/libnilfsfeature.la \
 sbin_PROGRAMS = mkfs.nilfs2
 
 mkfs_nilfs2_SOURCES = mkfs.c bitops.c mkfs.h
+
+EXTRA_DIST = .gitignore
diff --git a/sbin/mount/Makefile.am b/sbin/mount/Makefile.am
index 7927aba..4b5913d 100644
--- a/sbin/mount/Makefile.am
+++ b/sbin/mount/Makefile.am
@@ -30,3 +30,5 @@ mount_nilfs2_SOURCES = mount.nilfs2.c $(COMMONSOURCES) $(COMMONHEADERS)
 umount_nilfs2_SOURCES = umount.nilfs2.c $(COMMONSOURCES) $(COMMONHEADERS)
 
 endif  # CONFIG_LIBMOUNT
+
+EXTRA_DIST = .gitignore
diff --git a/sbin/nilfs-clean/Makefile.am b/sbin/nilfs-clean/Makefile.am
index 0925912..930464b 100644
--- a/sbin/nilfs-clean/Makefile.am
+++ b/sbin/nilfs-clean/Makefile.am
@@ -8,3 +8,5 @@ LDADD = $(top_builddir)/lib/libnilfs.la \
 sbin_PROGRAMS = nilfs-clean
 
 nilfs_clean_SOURCES = nilfs-clean.c
+
+EXTRA_DIST = .gitignore
diff --git a/sbin/nilfs-resize/Makefile.am b/sbin/nilfs-resize/Makefile.am
index 7a2b564..28db9f0 100644
--- a/sbin/nilfs-resize/Makefile.am
+++ b/sbin/nilfs-resize/Makefile.am
@@ -9,3 +9,5 @@ LDADD = $(top_builddir)/lib/libnilfs.la \
 sbin_PROGRAMS = nilfs-resize
 
 nilfs_resize_SOURCES = nilfs-resize.c
+
+EXTRA_DIST = .gitignore
diff --git a/sbin/nilfs-tune/Makefile.am b/sbin/nilfs-tune/Makefile.am
index 18a8768..63fe62b 100644
--- a/sbin/nilfs-tune/Makefile.am
+++ b/sbin/nilfs-tune/Makefile.am
@@ -9,3 +9,5 @@ LDADD = $(top_builddir)/lib/libnilfs.la \
 sbin_PROGRAMS = nilfs-tune
 
 nilfs_tune_SOURCES = nilfs-tune.c
+
+EXTRA_DIST = .gitignore
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
new file mode 100644
index 0000000..d37d5cd
--- /dev/null
+++ b/scripts/Makefile.am
@@ -0,0 +1,3 @@
+## Makefile.am
+
+dist_noinst_SCRIPTS = checkpatch.pl
-- 
1.7.9.3

--
To unsubscribe from this list: send the line "unsubscribe linux-nilfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Filesystem Development]     [Linux BTRFS]     [Linux CIFS]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux SCSI]

  Powered by Linux