* Compiles after merging b1_4

[fs/lustre-release.git] / lustre / utils / Makefile.am

diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index 9778767..20c1542 100644 (file)
--- a/lustre/utils/Makefile.am
+++ b/lustre/utils/Makefile.am
@@ -1,14 +1,57 @@
 # Administration utilities Makefile
-DEFS=
-
-CFLAGS:=-g -O2 -I. -I$(PORTALS)/include  -I$(srcdir)/../include -Wall\
- -L$(PORTALS)/linux/utils
-KFLAGS:=
-CPPFLAGS = $(HAVE_LIBREADLINE)
-obdctl_LDADD := $(LIBREADLINE)
-lctl_LDADD := $(LIBREADLINE) -lptlctl
-sbin_PROGRAMS = lctl obdctl
-obdctl_SOURCES = parser.c obdctl.c obd.c parser.h
-lctl_SOURCES = parser.c obd.c lctl.c lctl.h parser.h
-
-include $(top_srcdir)/Rules
+
+SUBDIRS = Lustre
+
+AM_CFLAGS=$(LLCFLAGS)
+AM_CPPFLAGS=$(LLCPPFLAGS) -DLUSTRE_UTILS=1
+
+LIBPTLCTL := $(top_builddir)/portals/utils/libptlctl.a
+
+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
+bin_PROGRAMS = lfs
+lib_LIBRARIES = liblustreapi.a
+sbin_SCRIPTS = $(sbin_scripts)
+bin_SCRIPTS = $(bin_scripts)
+endif # UTILS
+
+lctl_LDADD := $(LIBREADLINE) $(LIBPTLCTL)
+lctl_DEPENDENCIES := $(LIBPTLCTL)
+
+lfs_LDADD := $(LIBREADLINE) liblustreapi.a $(LIBPTLCTL)
+lfs_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a
+
+lload_LDADD := $(LIBREADLINE) $(LIBPTLCTL)
+lload_DEPENDENCIES := $(LIBPTLCTL)
+
+liblustreapi_a_SOURCES = liblustreapi.c
+
+wirecheck_SOURCES = wirecheck.c
+wirecheck_CPPFLAGS = -DCC="\"$(CC)\""
+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 parser.c obd.c
+
+llmount_SOURCES = llmount.c 
+llmount_LDADD = $(LIBREADLINE) $(LIBPTLCTL)
+llmount_DEPENDENCIES := $(LIBPTLCTL)
+
+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 $< $@