From 55d77931eafdb72452f555b3d48b655538f183a0 Mon Sep 17 00:00:00 2001 From: jacob Date: Tue, 3 May 2005 21:23:14 +0000 Subject: [PATCH] b=3418 - add dependencies on built libs --- lustre/utils/Makefile.am | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am index 8a28fda..c81428a 100644 --- a/lustre/utils/Makefile.am +++ b/lustre/utils/Makefile.am @@ -4,7 +4,8 @@ SUBDIRS = Lustre AM_CFLAGS=$(LLCFLAGS) AM_CPPFLAGS=$(LLCPPFLAGS) -AM_LDFLAGS := -L$(top_builddir)/portals/utils + +LIBPTLCTL := $(top_builddir)/portals/utils/libptlctl.a sbin_scripts = lconf lmc llanalyze llstat.pl llobdstat.pl lactive \ load_ldap.sh lrun lwizard @@ -20,9 +21,15 @@ sbin_SCRIPTS = $(sbin_scripts) bin_SCRIPTS = $(bin_scripts) endif # UTILS -lctl_LDADD := $(LIBREADLINE) -lptlctl -lpthread -lfs_LDADD := $(LIBREADLINE) parser.o liblustreapi.a -lptlctl obd.o -lload_LDADD := $(LIBREADLINE) -lptlctl +lctl_LDADD := $(LIBREADLINE) $(LIBPTLCTL) -lpthread +lctl_DEPENDENCIES := $(LIBPTLCTL) + +lfs_LDADD := $(LIBREADLINE) liblustreapi.a $(LIBPTLCTL) +lfs_DEPENDENCIES := liblustreapi.a $(LIBPTLCTL) + +lload_LDADD := $(LIBREADLINE) $(LIBPTLCTL) +lload_DEPENDENCIES := $(LIBPTLCTL) + liblustreapi_a_SOURCES = liblustreapi.c wirecheck_SOURCES = wirecheck.c wiretest_SOURCES = wiretest.c @@ -30,11 +37,15 @@ 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 +lfs_SOURCES = lfs.c parser.c obd.c + llmount_SOURCES = llmount.c -llmount_LDADD = $(LIBREADLINE) -lptlctl +llmount_LDADD = $(LIBREADLINE) $(LIBPTLCTL) +llmount_DEPENDENCIES := $(LIBPTLCTL) + lsd_upcall_SOURCES = lsd_upcall.c -lsd_upcall_LDADD = $(LIBREADLINE) -lptlctl +lsd_upcall_LDADD = $(LIBREADLINE) $(LIBPTLCTL) +lsd_upcall_DEPENDENCIES := $(LIBPTLCTL) EXTRA_DIST = $(bin_scripts) $(sbin_scripts) -- 1.8.3.1