X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flvfs%2FautoMakefile.am;h=dbd35b7b8f9dd2fae3e114b2912b8d2460e4e03d;hb=772093d90f9e011c6a37c94b6d7149692c2fa388;hp=77faaf210c34c26e747435a1b4db91ea0b8ed8da;hpb=85e4fee3be74cd0e6f2f2e5593711abd6ec4eb23;p=fs%2Flustre-release.git diff --git a/lustre/lvfs/autoMakefile.am b/lustre/lvfs/autoMakefile.am index 77faaf2..dbd35b7 100644 --- a/lustre/lvfs/autoMakefile.am +++ b/lustre/lvfs/autoMakefile.am @@ -4,7 +4,7 @@ # See the file COPYING in this distribution if LIBLUSTRE noinst_LIBRARIES = liblvfs.a -liblvfs_a_SOURCES = lvfs_userfs.c +liblvfs_a_SOURCES = lvfs_userfs.c prng.c lvfs_lib.c liblvfs_a_CFLAGS = $(LLCFLAGS) liblvfs_a_CPPFLAGS = $(LLCPPFLAGS) @@ -22,26 +22,13 @@ modulefs_DATA := lvfs$(KMODEXT) if SERVER modulefs_DATA += fsfilt_$(BACKINGFS)$(KMODEXT) -if LDISKFS - -modulefs_DATA += fsfilt_ldiskfs2$(KMODEXT) -sources: fsfilt_$(BACKINGFS).c fsfilt_ldiskfs2.c - touch sources - -else #LDISKFS - sources: fsfilt_$(BACKINGFS).c touch sources -endif #LDISKFS - else #SERVER sources: -endif #SERVER - -fsfilt_extN.c: fsfilt_ext3.c - sed -e "s/EXT3/EXTN/g" -e "s/ext3/extN/g" $< > $@ +endif ldiskfs_sed_flags = \ -e "s/dx_hash_info/ext3_dx_hash_info/g" \ @@ -51,18 +38,8 @@ ldiskfs_sed_flags = \ -e "s/rsv_window_add/ext3_rsv_window_add/g" \ -e "s/EXT3/LDISKFS/g" -e "s/ext3/ldiskfs/g" -ldiskfs2_sed_flags = \ - -e "s/dx_hash_info/ext3_dx_hash_info/g" \ - -e "s/dir_private_info/ext3_dir_private_info/g" \ - -e "s/DX_HASH/EXT3_DX_HASH/g" \ - -e "s/reserve_window/ext3_reserve_window/g" \ - -e "s/rsv_window_add/ext3_rsv_window_add/g" \ - -e "s/EXT3/LDISKFS2/g" -e "s/ext3/ldiskfs2/g" - fsfilt_ldiskfs.c: fsfilt_ext3.c sed $(strip $(ldiskfs_sed_flags)) $< > $@ -fsfilt_ldiskfs2.c: fsfilt_ext3.c - sed $(strip $(ldiskfs2_sed_flags)) $< > $@ fsfilt_ldiskfs_quota.h: fsfilt_ext3_quota.h sed $(strip $(ldiskfs_sed_flags)) $< > $@ @@ -94,7 +71,7 @@ install-data-hook: $(install_data_hook) DIST_SOURCES = fsfilt.c fsfilt_ext3.c fsfilt_reiserfs.c lvfs_common.c \ lvfs_internal.h lvfs_linux.c lvfs_userfs.c \ - upcall_cache.c \ + upcall_cache.c prng.c lvfs_lib.c \ lustre_quota_fmt.c lustre_quota_fmt.h quotafmt_test.c \ # quotacheck_test.c quotactl_test.c fsfilt_ext3_quota.h