LU-3462 build: Repair "make dist"

The "make dist" target should assemble a canonical tarball of the
lustre source tree.  Generally speaking, it should not be effected
by command line options given to the configure script.

For instance, all source files should appear in the tarball regardless
of whether or "--disable-server" is engadged.  Some recent LU-1330
landings have broken this by making compilation of some source files
optional, but failing to add those optional source files to EXTRA_DIST.

Change-Id: I20dc0f791a2a70f921d78c62b00992aa90aa0eaf
Signed-off-by: Christopher J. Morrone <morrone2@llnl.gov>
Reviewed-on: http://review.whamcloud.com/7054
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Liu Xuezhao <xuezhao.liu@emc.com>
Reviewed-by: Minh Diep <minh.diep@intel.com>
Reviewed-by: Brian J. Murrell <brian.murrell@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/doc/Makefile.am b/lustre/doc/Makefile.am
index 304c414..691d98c 100644 (file)
--- a/lustre/doc/Makefile.am
+++ b/lustre/doc/Makefile.am
@@ -44,9 +44,12 @@ MANFILES = lustre.7 lfs.1 mount.lustre.8 lctl.8 \
        lustre_rsync.8 lfs_migrate.1 lhbadm.8 ldev.8 ldev.conf.5 nids.5 \
        lfs-hsm.1 llapi_hsm_state_get.3 llapi_hsm_state_set.3 \
        lustre_routes_config.8 lustre_routes_conversion.8
+SERVER_MANFILES = mkfs.lustre.8 tunefs.lustre.8
 
 if SERVER
-MANFILES += mkfs.lustre.8 tunefs.lustre.8
+MANFILES += $(SERVER_MANFILES)
+else
+DISTONLY_MANFILES = $(SERVER_MANFILES)
 endif
 
 if UTILS
@@ -55,6 +58,6 @@ endif
 
 CLEANFILES = *.aux *.tex *.log *.pdf
 
-EXTRA_DIST = $(MANFILES)
+EXTRA_DIST = $(MANFILES) $(DISTONLY_MANFILES)
 
 all:

diff --git a/lustre/fid/Makefile.in b/lustre/fid/Makefile.in
index 8b0c6e4..b0a2936 100644 (file)
--- a/lustre/fid/Makefile.in
+++ b/lustre/fid/Makefile.in
@@ -1,4 +1,8 @@
 MODULES := fid
 fid-objs := fid_request.o lproc_fid.o
 @SERVER_TRUE@fid-objs += fid_handler.o fid_store.o fid_lib.o
+
+EXTRA_DIST = $(fid-objs:%.o=%.c) fid_internal.h
+@SERVER_FALSE@EXTRA_DIST += fid_handler.c fid_store.c fid_lib.c
+
 @INCLUDE_RULES@

diff --git a/lustre/fid/autoMakefile.am b/lustre/fid/autoMakefile.am
index 9f21c2c..b4c590e 100644 (file)
--- a/lustre/fid/autoMakefile.am
+++ b/lustre/fid/autoMakefile.am
@@ -47,5 +47,4 @@ endif
 
 install-data-hook: $(install_data_hook)
 
-MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
-EXTRA_DIST = $(fid-objs:%.o=%.c) fid_internal.h
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@

diff --git a/lustre/fld/Makefile.in b/lustre/fld/Makefile.in
index e869668..fcde1bf 100644 (file)
--- a/lustre/fld/Makefile.in
+++ b/lustre/fld/Makefile.in
@@ -3,5 +3,7 @@ fld-objs := fld_request.o fld_cache.o lproc_fld.o
 @SERVER_TRUE@fld-objs += fld_handler.o fld_index.o
 
 EXTRA_PRE_CFLAGS := -I@LUSTRE@
+EXTRA_DIST := $(fld-objs:%.o=%.c) fld_internal.h
+@SERVER_FALSE@EXTRA_DIST += fld_handler.c fld_index.c
 
 @INCLUDE_RULES@

diff --git a/lustre/fld/autoMakefile.am b/lustre/fld/autoMakefile.am
index a8aa63a..bc5ed6b 100644 (file)
--- a/lustre/fld/autoMakefile.am
+++ b/lustre/fld/autoMakefile.am
@@ -46,4 +46,3 @@ modulefs_DATA = fld$(KMODEXT)
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
-EXTRA_DIST := $(fld-objs:%.o=%.c) fld_internal.h

diff --git a/lustre/obdclass/Makefile.in b/lustre/obdclass/Makefile.in
index aee15cb..371c8f4 100644 (file)
--- a/lustre/obdclass/Makefile.in
+++ b/lustre/obdclass/Makefile.in
@@ -28,5 +28,8 @@ EXTRA_PRE_CFLAGS := -I@LINUX@/fs -I@LDISKFS_DIR@ -I@LDISKFS_DIR@/ldiskfs
 
 EXTRA_DIST = $(obdclass-all-objs:.o=.c) llog_test.c llog_internal.h
 EXTRA_DIST += cl_internal.h local_storage.h
+@LDISKFS_ENABLED_FALSE@EXTRA_DIST += llog_lvfs.c
+@SERVER_FALSE@EXTRA_DIST += lprocfs_jobstats.c
+@SERVER_FALSE@EXTRA_DIST += obd_mount_server.c
 
 @INCLUDE_RULES@

diff --git a/lustre/obdecho/Makefile.in b/lustre/obdecho/Makefile.in
index 0cea034..dcf9368 100644 (file)
--- a/lustre/obdecho/Makefile.in
+++ b/lustre/obdecho/Makefile.in
@@ -3,5 +3,6 @@ obdecho-objs := echo_client.o lproc_echo.o
 @SERVER_TRUE@obdecho-objs += echo.o
 
 EXTRA_DIST = $(obdecho-objs:%.o=%.c) echo_internal.h
+@SERVER_FALSE@EXTRA_DIST += echo.c
 
 @INCLUDE_RULES@

diff --git a/lustre/ptlrpc/Makefile.in b/lustre/ptlrpc/Makefile.in
index a28f497..ec9416d 100644 (file)
--- a/lustre/ptlrpc/Makefile.in
+++ b/lustre/ptlrpc/Makefile.in
@@ -40,7 +40,8 @@ tgt_%.c: @LUSTRE@/target/tgt_%.c
        ln -sf $< $@
 
 EXTRA_DIST := $(ptlrpc_objs:.o=.c) ptlrpc_internal.h
-@SERVER_TRUE@EXTRA_DIST += $(TARGET)tgt_internal.h
+EXTRA_DIST += $(TARGET)tgt_internal.h
+@SERVER_FALSE@EXTRA_DIST += $(target_objs:.o=.c)
 
 EXTRA_PRE_CFLAGS := -I@LUSTRE@/ldlm -I@LUSTRE@/target