* 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 0a3f785..20c1542 100644 (file)
--- a/lustre/utils/Makefile.am
+++ b/lustre/utils/Makefile.am
@@ -1,45 +1,52 @@
 # Administration utilities Makefile
-DEFS=
-SUBDIRS = Lustre
-
-CFLAGS:=-g -O2 -I$(top_srcdir)/utils -I$(top_srcdir)/portals/include  -I$(srcdir)/../include -Wall -L../portals/utils
-CPPFLAGS = $(HAVE_LIBREADLINE)
 
-if LIBLUSTRE
-
-bin_SCRIPTS = lrun
+SUBDIRS = Lustre
 
-EXTRA_DIST = $(sbin_SCRIPTS)
+AM_CFLAGS=$(LLCFLAGS)
+AM_CPPFLAGS=$(LLCPPFLAGS) -DLUSTRE_UTILS=1
 
-include $(top_srcdir)/Rules
+LIBPTLCTL := $(top_builddir)/portals/utils/libptlctl.a
 
-else
+sbin_scripts = lconf lmc llanalyze llstat.pl llobdstat.pl lactive      \
+       load_ldap.sh lrun lwizard
+bin_scripts = lfind lstripe
 
-KFLAGS:=
-lctl_LDADD := $(LIBREADLINE) -lptlctl
-lfs_LDADD := $(LIBREADLINE) parser.o liblustreapi.a -lptlctl obd.o
-lload_LDADD := -lptlctl
+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
 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 
-llmount_SOURCES = llmount.c 
-llmount_LDADD = -lptlctl
+lfs_SOURCES = lfs.c parser.c obd.c
 
-EXTRA_DIST = $(bin_SCRIPTS) $(sbin_SCRIPTS)
+llmount_SOURCES = llmount.c 
+llmount_LDADD = $(LIBREADLINE) $(LIBPTLCTL)
+llmount_DEPENDENCIES := $(LIBPTLCTL)
 
-include $(top_srcdir)/Rules
+EXTRA_DIST = $(bin_scripts) $(sbin_scripts)
 
 # NOTE: this should only be run on i386.
 newwiretest: wirehdr.c wirecheck
@@ -47,6 +54,4 @@ newwiretest: wirehdr.c wirecheck
        ./wirecheck >> wiretest.c
 
 mount.lustre$(EXEEXT): llmount
-       cp llmount mount.lustre
-
-endif
+       cp $< $@