X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2FMakefile.am;h=62707cc112fb565179c63c4971a5acafd4a99414;hb=89f9a5bced24ecb7c84040a1ed88dcef4384f7c6;hp=0320ff2237da1c0adcd49899e747738cadded946;hpb=26f846563602a3275472079c2a360a88ac4db514;p=fs%2Flustre-release.git

diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index 0320ff2..62707cc 100644
--- a/lustre/utils/Makefile.am
+++ b/lustre/utils/Makefile.am
@@ -1,14 +1,46 @@
 # Administration utilities Makefile
-DEFS=
-
-CFLAGS:=-g -O2 -I. -I/usr/include/libxml2 -I/usr/include/glib-1.2 -I$(PORTALS)/include \
--I/usr/lib/glib/include -I$(srcdir)/../include -Wall
-KFLAGS:=
-CPPFLAGS = $(HAVE_LIBREADLINE)
-obdctl_LDADD := $(LIBREADLINE) -lxml2 # -lefence
-lctl_LDADD := $(LIBREADLINE)
-sbin_PROGRAMS = lctl obdctl
-obdctl_SOURCES = parser.c obdctl.c parser.h
-lctl_SOURCES = parser.c network.c device.c debug.c lctl.c lctl.h parser.h
-
-include $(top_srcdir)/Rules
+
+SUBDIRS = Lustre
+
+AM_CFLAGS=$(LLCFLAGS)
+AM_CPPFLAGS=$(LLCPPFLAGS)
+AM_LDFLAGS := -L$(top_builddir)/portals/utils
+
+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 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
+lctl_SOURCES = parser.c obd.c lustre_cfg.c lctl.c parser.h obdctl.h
+lload_SOURCES = lload.c 
+obdio_SOURCES = obdio.c obdiolib.c obdiolib.h
+obdbarrier_SOURCES = obdbarrier.c obdiolib.c obdiolib.h
+lfs_SOURCES = lfs.c 
+llmount_SOURCES = llmount.c 
+llmount_LDADD = $(LIBREADLINE) -lptlctl
+lsd_upcall_SOURCES = lsd_upcall.c
+
+EXTRA_DIST = $(bin_scripts) $(sbin_scripts)
+
+# NOTE: this should only be run on i386.
+newwiretest: wirehdr.c wirecheck
+	cp wirehdr.c wiretest.c
+	./wirecheck >> wiretest.c
+
+mount.lustre$(EXEEXT): llmount
+	cp $< $@