Whamcloud - gitweb
LU-3462 ldiskfs: Subsume ldiskfs's build system into lustre 50/6850/22
authorChristopher J. Morrone <morrone2@llnl.gov>
Sat, 15 Jun 2013 00:08:10 +0000 (17:08 -0700)
committerOleg Drokin <oleg.drokin@intel.com>
Thu, 12 Sep 2013 05:03:20 +0000 (05:03 +0000)
commit4dd31baae9a73502c5c7bb5c0962fd703e231fd5
tree451cc7f5c366c49a9145fd614c10a8255d67f337
parentb117c34421890de18afcf23f29bdb4077acc5568
LU-3462 ldiskfs: Subsume ldiskfs's build system into lustre

Remove ldiskfs's independant build system (configure, spec
file, etc.) and merge its build into lustre's build system.

Move the ldiskfs/ldiskfs directory up one level.  The extra
directory level is no longer needed without the independant
ldiskfs build system.

Add a make dependency on ldiskfs's "sources" target in
ldiskfs/autoMakefile.am rather than explicitly launching a
separate make instance from the top level autoMakefile.am.

Remove unused "sources" targets in libcfs, lnet, and lustre/obdclass.

Improve the handling of the --disable-ldiskfs option, and make it
interact with other configure options more cleanly.

Change-Id: Id0787f27269e938032e480c7c627327c0adf2672
Signed-off-by: Christopher J. Morrone <morrone2@llnl.gov>
Reviewed-on: http://review.whamcloud.com/6850
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.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>
38 files changed:
Makefile.in
autoMakefile.am
autogen.sh
config/lustre-build-ldiskfs.m4
config/lustre-build-linux.m4
config/lustre-build-zfs.m4
config/lustre-build.m4
configure.ac
contrib/lbuild/lbuild
debian/rules
ldiskfs/.gitignore
ldiskfs/COPYING [deleted file]
ldiskfs/ChangeLog [deleted file]
ldiskfs/Makefile.am [deleted file]
ldiskfs/Makefile.in [new file with mode: 0644]
ldiskfs/autoMakefile.am [new file with mode: 0644]
ldiskfs/autogen.sh [deleted file]
ldiskfs/config/.gitignore [deleted file]
ldiskfs/config/ldiskfs-build.m4 [deleted file]
ldiskfs/configure.ac [deleted file]
ldiskfs/ldiskfs/.gitignore [deleted file]
ldiskfs/ldiskfs/Makefile.in [deleted file]
ldiskfs/ldiskfs/ldiskfs_config.h.in [deleted file]
ldiskfs/lustre-ldiskfs.spec.in [deleted file]
libcfs/autoMakefile.am
libcfs/libcfs/Makefile.in
lnet/autoMakefile.am
lustre-iokit/Makefile.am
lustre.spec.in
lustre/autoMakefile.am
lustre/autoconf/lustre-core.m4
lustre/lvfs/Makefile.in
lustre/lvfs/fsfilt_ext3.c
lustre/obdclass/Makefile.in
lustre/osd-ldiskfs/Makefile.in
lustre/osd-ldiskfs/osd_internal.h
lustre/tests/.gitignore
lustre/tests/test-framework.sh