From 8760ce671413af7dd7b689029db124b9c3bee3a0 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Fri, 18 Mar 2005 00:23:57 +0000 Subject: [PATCH] use $(LIBENSCVECTOR) instead of libensc_vector.a use $(LIBVSERVER_GLIBC) instead of lib/libvserver.la git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1920 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/src/Makefile-files | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/util-vserver/src/Makefile-files b/util-vserver/src/Makefile-files index ed081bc..5ccccdf 100644 --- a/util-vserver/src/Makefile-files +++ b/util-vserver/src/Makefile-files @@ -233,7 +233,7 @@ src_vserver_info_LDADD = $(LIBINTERNAL) $(VSERVER_LDADDS) src_vserver_info_LDFLAGS = $(VSERVER_LDFLGS) src_vserver_stat_SOURCES = src/vserver-stat.c -src_vserver_stat_LDADD = $(LIBINTERNAL) $(VSERVER_LDADDS) libensc_vector.a +src_vserver_stat_LDADD = $(LIBINTERNAL) $(VSERVER_LDADDS) $(LIBENSCVECTOR) src_vserver_stat_LDFLAGS = $(VSERVER_LDFLGS) src_vfiles_SOURCES = src/vfiles.cc src/vutil.cc src/vserver.cc @@ -241,7 +241,7 @@ src_vbuild_SOURCES = src/vbuild.cc src/vutil.cc src/vserver.cc src_vcheck_SOURCES = src/vcheck.cc src/vutil.cc src/vserver.cc src_lsxid_SOURCES = src/fstool.c src/lsxid.c -src_lsxid_LDADD = $(LIBINTERNAL) $(VSERVER_LDADDS) libensc_vector.a +src_lsxid_LDADD = $(LIBINTERNAL) $(VSERVER_LDADDS) $(LIBENSCVECTOR) src_lsxid_LDFLAGS = $(VSERVER_LDFLGS) src_chxid_SOURCES = src/fstool.c src/chxid.c @@ -271,10 +271,10 @@ src_vunify_LDFLAGS = $(VSERVER_LDFLGS) src_vhashify_SOURCES = src/vhashify.c if CAN_BEECRYPT_WITH_DIETLIBC -src_vhashify_LDADD = $(LIBINTERNAL) libensc_vector.a -lbeecrypt $(VSERVER_LDADDS) +src_vhashify_LDADD = $(LIBINTERNAL) $(LIBENSCVECTOR) -lbeecrypt $(VSERVER_LDADDS) src_vhashify_LDFLAGS = $(VSERVER_LDFLGS) else -src_vhashify_LDADD = $(LIBINTERNAL_GLIBC) libensc_vector.a lib/libvserver.la -lbeecrypt +src_vhashify_LDADD = $(LIBINTERNAL_GLIBC) $(LIBENSCVECTOR_GLIBC) $(LIBVSERVER_GLIBC) -lbeecrypt src_vhashify_LDFLAGS = endif @@ -285,7 +285,7 @@ src_vuname_LDFLAGS = $(VSERVER_LDFLGS) src_rpm_fake_la_SOURCES = src/rpm-fake.c src_rpm_fake_la_CFLAGS = $(AM_CFLAGS) src_rpm_fake_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir) -src_rpm_fake_la_LIBADD = lib/libvserver.la -ldl +src_rpm_fake_la_LIBADD = $(LIBVSERVER_GLIBC) -ldl src_vdlimit_SOURCES = src/vdlimit.c src_vdlimit_LDADD = $(VSERVER_LDADDS) -- 1.8.1.5