X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2FMakefile.am;h=0a3f7852ebccf77c80d643c16f6172ff55729200;hb=090c677210ee2946d99c71412e4ff762bb300f4f;hp=f01b8edba975bcd223486e87ee11f719be4b4811;hpb=a42613476b829da3c4e5eac04045508345856c25;p=fs%2Flustre-release.git

diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index f01b8ed..0a3f785 100644
--- a/lustre/utils/Makefile.am
+++ b/lustre/utils/Makefile.am
@@ -1,16 +1,52 @@
 # Administration utilities Makefile
 DEFS=
+SUBDIRS = Lustre
 
-CFLAGS:=-g -O2 -I. -I$(PORTALS)/include  -I$(srcdir)/../include -Wall\
- -L$(PORTALS)/linux/utils
-KFLAGS:=
+CFLAGS:=-g -O2 -I$(top_srcdir)/utils -I$(top_srcdir)/portals/include  -I$(srcdir)/../include -Wall -L../portals/utils
 CPPFLAGS = $(HAVE_LIBREADLINE)
-obdctl_LDADD := $(LIBREADLINE)
-lctl_LDADD := $(LIBREADLINE) -lptlctl
-sbin_PROGRAMS = lctl obdctl
-sbin_SCRIPTS = lconf lmc
-obdctl_SOURCES = parser.c obdctl.c obd.c parser.h obdctl.h
-lctl_SOURCES = parser.c obd.c lctl.c parser.h
+
+if LIBLUSTRE
+
+bin_SCRIPTS = lrun
+
 EXTRA_DIST = $(sbin_SCRIPTS)
 
 include $(top_srcdir)/Rules
+
+else
+
+KFLAGS:=
+lctl_LDADD := $(LIBREADLINE) -lptlctl
+lfs_LDADD := $(LIBREADLINE) parser.o liblustreapi.a -lptlctl obd.o
+lload_LDADD := -lptlctl
+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
+bin_PROGRAMS = lfs
+lib_LIBRARIES = liblustreapi.a
+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 = -lptlctl
+
+EXTRA_DIST = $(bin_SCRIPTS) $(sbin_SCRIPTS)
+
+include $(top_srcdir)/Rules
+
+# 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 llmount mount.lustre
+
+endif