-pkglib_LTLIBRARIES += mount_osd_ldiskfs.la
-
-mount_osd_ldiskfs_la_SOURCES = mount_utils_ldiskfs.c
-mount_osd_ldiskfs_la_LDFLAGS = -shared -export-dynamic -module -avoid-version
-mount_osd_ldiskfs_la_LIBADD := $(SELINUX)
-endif
-
-mount_lustre_SOURCES = mount_lustre.c mount_utils.c mount_utils.h
-mount_lustre_CPPFLAGS = $(AM_CPPFLAGS) ${MNTMODCFLAGS}
-mount_lustre_LDADD := $(LIBPTLCTL) $(SELINUX)
-mount_lustre_DEPENDENCIES := $(LIBPTLCTL)
-mount_lustre_LDFLAGS = ${MNTMODLDFLAGS}
-
-mkfs_lustre_SOURCES = mkfs_lustre.c mount_utils.c mount_utils.h
-mkfs_lustre_CPPFLAGS = -UTUNEFS $(AM_CPPFLAGS) ${MNTMODCFLAGS}
-mkfs_lustre_LDADD := $(LIBPTLCTL)
-mkfs_lustre_DEPENDENCIES := $(LIBPTLCTL)
-mkfs_lustre_LDFLAGS = ${MNTMODLDFLAGS}
-
-tunefs_lustre_SOURCES = mkfs_lustre.c mount_utils.c mount_utils.h
-tunefs_lustre_CPPFLAGS = -DTUNEFS $(AM_CPPFLAGS) ${MNTMODCFLAGS}
-tunefs_lustre_LDADD := $(mkfs_lustre_LDADD)
-tunefs_lustre_DEPENDENCIES := $(mkfs_lustre_DEPENDENCIES)
-tunefs_lustre_LDFLAGS = ${MNTMODLDFLAGS}
+noinst_LIBRARIES += libmount_utils_ldiskfs.a
+
+libmount_utils_ldiskfs_a_SOURCES = libmount_utils_ldiskfs.c
+libmount_utils_ldiskfs_a_CPPFLAGS := $(SELINUX)
+
+if PLUGINS
+lib_LTLIBRARIES += libmount_utils_ldiskfs.la
+libmount_utils_ldiskfs.la : libmount_utils_ldiskfs.a
+ $(CC) $(LDFLAGS) $(MNTMODLDFLAGS) -shared -export-dynamic \
+ -o mount_osd_ldiskfs.so \
+ `$(AR) -t libmount_utils_ldiskfs.a` \
+ $(MNTMODLIBS) $(SELINUX)
+else
+PLUGIN_LIB += libmount_utils_ldiskfs.a
+endif # PLUGINS
+endif # LDISKFS_ENABLED
+
+mount_lustre_SOURCES = mount_lustre.c mount_utils.c mount_utils.h $(GSSSRC)
+mount_lustre_CPPFLAGS := ${MNTMODCFLAGS}
+mount_lustre_LDFLAGS := ${MNTMODLDFLAGS}
+mount_lustre_LDADD := $(SELINUX) $(LDLIBMOUNT) $(PLUGIN_LIB) $(GSSLIB) \
+ $(top_builddir)/libcfs/libcfs/libcfs.la $(MNTMODLIBS)
+
+mkfs_lustre_SOURCES = mkfs_lustre.c mount_utils.c mount_utils.h $(GSSSRC)
+mkfs_lustre_CPPFLAGS := -UTUNEFS ${MNTMODCFLAGS}
+mkfs_lustre_LDFLAGS := ${MNTMODLDFLAGS}
+mkfs_lustre_LDADD := $(mount_lustre_LDADD)
+
+tunefs_lustre_SOURCES = mkfs_lustre.c mount_utils.c mount_utils.h $(GSSSRC)
+tunefs_lustre_CPPFLAGS := -DTUNEFS ${MNTMODCFLAGS}
+tunefs_lustre_LDFLAGS := ${MNTMODLDFLAGS}
+tunefs_lustre_LDADD := $(mkfs_lustre_LDADD)
+
+l_tunedisk_SOURCES = l_tunedisk.c mount_utils.c mount_utils.h $(GSSSRC)
+l_tunedisk_CPPFLAGS := ${MNTMODCFLAGS}
+l_tunedisk_LDFLAGS := ${MNTMODLDFLAGS}
+l_tunedisk_LDADD := $(mount_lustre_LDADD)