AM_CPPFLAGS=$(LLCPPFLAGS)
AM_LDFLAGS := -L$(top_builddir)/portals/utils
-lctl_LDADD := $(LIBREADLINE) -lptlctl
-lfs_LDADD := $(LIBREADLINE) parser.o liblustreapi.a -lptlctl obd.o
-lload_LDADD := $(LIBREADLINE) -lptlctl
+sbin_scripts = lconf lmc llanalyze llstat.pl llobdstat.pl lactive \
+ load_ldap.sh lrun lwizard
+bin_scripts = lfind lstripe
+
+
+if UTILS
rootsbin_SCRIPTS = mount.lustre
-sbin_PROGRAMS = lctl obdio obdbarrier lload wirecheck wiretest llmount
-sbin_SCRIPTS = lconf lmc llanalyze llstat.pl llobdstat.pl lactive load_ldap.sh lrun
-sbin_SCRIPTS += lwizard
-bin_SCRIPTS = lfind lstripe
+sbin_PROGRAMS = lctl obdio obdbarrier lload wirecheck wiretest llmount lsd_upcall
bin_PROGRAMS = lfs
lib_LIBRARIES = liblustreapi.a
+sbin_SCRIPTS = $(sbin_scripts)
+bin_SCRIPTS = $(bin_scripts)
+endif # UTILS
+
+lctl_LDADD := $(LIBREADLINE) -lptlctl -lpthread
+lfs_LDADD := $(LIBREADLINE) parser.o liblustreapi.a -lptlctl obd.o
+lload_LDADD := $(LIBREADLINE) -lptlctl
liblustreapi_a_SOURCES = liblustreapi.c
wirecheck_SOURCES = wirecheck.c
wiretest_SOURCES = wiretest.c
lfs_SOURCES = lfs.c
llmount_SOURCES = llmount.c
llmount_LDADD = $(LIBREADLINE) -lptlctl
+lsd_upcall_SOURCES = lsd_upcall.c
-if LIBLUSTRE
-sbin_SCRIPTS += lrun
-endif
-
-EXTRA_DIST = $(bin_SCRIPTS) $(sbin_SCRIPTS)
+EXTRA_DIST = $(bin_scripts) $(sbin_scripts)
# NOTE: this should only be run on i386.
newwiretest: wirehdr.c wirecheck