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>
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
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
-MANFILES += mkfs.lustre.8 tunefs.lustre.8
+MANFILES += $(SERVER_MANFILES)
+else
+DISTONLY_MANFILES = $(SERVER_MANFILES)
CLEANFILES = *.aux *.tex *.log *.pdf
CLEANFILES = *.aux *.tex *.log *.pdf
-EXTRA_DIST = $(MANFILES)
+EXTRA_DIST = $(MANFILES) $(DISTONLY_MANFILES)
MODULES := fid
fid-objs := fid_request.o lproc_fid.o
@SERVER_TRUE@fid-objs += fid_handler.o fid_store.o fid_lib.o
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
+
install-data-hook: $(install_data_hook)
install-data-hook: $(install_data_hook)
-MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
-EXTRA_DIST = $(fid-objs:%.o=%.c) fid_internal.h
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
@SERVER_TRUE@fld-objs += fld_handler.o fld_index.o
EXTRA_PRE_CFLAGS := -I@LUSTRE@
@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
endif
MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
endif
MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
-EXTRA_DIST := $(fld-objs:%.o=%.c) fld_internal.h
EXTRA_DIST = $(obdclass-all-objs:.o=.c) llog_test.c llog_internal.h
EXTRA_DIST += cl_internal.h local_storage.h
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
@SERVER_TRUE@obdecho-objs += echo.o
EXTRA_DIST = $(obdecho-objs:%.o=%.c) echo_internal.h
@SERVER_TRUE@obdecho-objs += echo.o
EXTRA_DIST = $(obdecho-objs:%.o=%.c) echo_internal.h
+@SERVER_FALSE@EXTRA_DIST += echo.c
ln -sf $< $@
EXTRA_DIST := $(ptlrpc_objs:.o=.c) ptlrpc_internal.h
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
EXTRA_PRE_CFLAGS := -I@LUSTRE@/ldlm -I@LUSTRE@/target