land b_smallfix 20040407_1414:

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

diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am
index d37259c..c65b932 100644 (file)
--- a/lustre/tests/Makefile.am
+++ b/lustre/tests/Makefile.am
@@ -1,7 +1,6 @@
 # Lustre test Makefile
-DEFS=
-CPPFLAGS = -I. -I$(top_srcdir)/portals/include/ -I$(top_srcdir)/include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS := -g -Wall
+AM_CPPFLAGS = $(LLCPPFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+AM_CFLAGS = $(LLCFLAGS)
 # LDADD = -lldap
 # LDADD := -lreadline -ltermcap # -lefence
 EXTRA_DIST = $(pkgexample_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) \
@@ -62,8 +61,7 @@ o_directory_SOURCES = o_directory.c
 utime_SOURCES = utime.c
 cmknod_SOURCES = cmknod.c
 mkdirdeep_SOURCES = mkdirdeep.c
-mkdirdeep_LDADD=-L$(top_builddir)/portals/utils -lptlctl
-mkdirdeep_CPPFLAGS=-I$(top_srcdir)/portals/include
+mkdirdeep_LDADD=-L$(top_builddir)/portals/utils -lptlctl $(LIBREADLINE)
 small_write_SOURCES = small_write.c
 sleeptest_SOURCES = sleeptest.c
 #write_append_truncate_SOURCES=write_append_truncate.c
@@ -75,5 +73,3 @@ sleeptest_SOURCES = sleeptest.c
 ll_sparseness_verify_SOURCES = ll_sparseness_verify.c
 ll_sparseness_write_SOURCES = ll_sparseness_write.c
 ll_dirstripe_verify_SOURCE = ll_dirstripe_verify.c
-
-include $(top_srcdir)/Rules