X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Flibcfs%2FautoMakefile.am;h=1bbe71c4ad3bc0ab5bfd5699cb29ba2971a07c46;hp=fd97164cb77be1dc31a020b8c2aba306a0e575de;hb=05d13ca333a3158a98f0c0e048a85564c6b9ed88;hpb=e21b3025fa9f6bf7b02451ee0e7537306cafc1b8

diff --git a/libcfs/libcfs/autoMakefile.am b/libcfs/libcfs/autoMakefile.am
index fd97164..1bbe71c 100644
--- a/libcfs/libcfs/autoMakefile.am
+++ b/libcfs/libcfs/autoMakefile.am
@@ -40,15 +40,14 @@ SUBDIRS = linux util
 DIST_SUBDIRS = linux util
 
 noinst_LIBRARIES= libcfs.a
-libcfs_a_SOURCES = user-string.c
+libcfs_a_SOURCES = util/string.c util/nidstrings.c
 
 libcfs_a_CPPFLAGS = $(LLCPPFLAGS)
 libcfs_a_CFLAGS = $(LLCFLAGS)
 
 if UTILS
 lib_LIBRARIES = libcfsutil.a
-libcfsutil_a_SOURCES = nidstrings.c libcfs_string.c util/parser.c	\
-		util/l_ioctl.c util/util.c
+libcfsutil_a_SOURCES = util/parser.c util/l_ioctl.c util/util.c
 libcfsutil_a_CPPFLAGS = $(LLCPPFLAGS)
 libcfsutil_a_CFLAGS = $(LLCFLAGS) -DLUSTRE_UTILS=1
 endif
@@ -63,6 +62,5 @@ endif # MODULES
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ linux-*.c linux/*.o libcfs
 EXTRA_DIST := $(libcfs-all-objs:%.o=%.c) tracefile.h prng.c \
-	      workitem.c \
-	      kernel_user_comm.c fail.c libcfs_cpu.c heap.c \
-	      libcfs_mem.c libcfs_lock.c user-string.c
+	      workitem.c kernel_user_comm.c fail.c libcfs_cpu.c \
+	      heap.c libcfs_mem.c libcfs_lock.c