From d26338e35feb1c2b20c8136f935e0e965f85d462 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Tue, 29 Mar 2005 02:10:05 +0000 Subject: [PATCH] use $(LIBENSCVECTOR) instead of libensc_vector.a git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1993 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/ensc_vector/Makefile-files | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/util-vserver/ensc_vector/Makefile-files b/util-vserver/ensc_vector/Makefile-files index ec62f20..b2d9aa7 100644 --- a/util-vserver/ensc_vector/Makefile-files +++ b/util-vserver/ensc_vector/Makefile-files @@ -43,8 +43,6 @@ ENSC_VECTOR_HDRS = ensc_vector/vector.h \ ensc_vector/list.h \ ensc_vector/list.hc -LIBENSCVECTOR_GLIBC = libensc_vector-glibc.a -ENSC_VECTOR_LIBS = $(LIBENSCVECTOR_GLIBC) libensc_vector_glibc_a_SOURCES = $(ENSC_VECTOR_SRCS) libensc_vector_glibc_a_CPPFLAGS = $(AM_CPPFLAGS) @@ -52,15 +50,33 @@ libensc_vector_glibc_a_CPPFLAGS = $(AM_CPPFLAGS) libensc_vector_diet_a_SOURCES = $(ENSC_VECTOR_SRCS) libensc_vector_diet_a_CPPFLAGS = $(AM_CPPFLAGS) -if USE_DIETLIBC +ENSC_VECTOR_LIBS = + +if ENSC_USE_GLIBC +LIBENSCVECTOR_GLIBC = libensc_vector-glibc.a +ENSC_VECTOR_LIBS += $(LIBENSCVECTOR_GLIBC) +else +LIBENSCVECTOR_GLIBC = lib-glibc-not-enabled-error.a +endif + +if ENSC_USE_DIETLIBC LIBENSCVECTOR_DIET = libensc_vector-diet.a -LIBENSCVECTOR = $(LIBENSCVECTOR_DIET) ENSC_VECTOR_LIBS += $(LIBENSCVECTOR_DIET) else LIBENSCVECTOR_DIET = lib-dietlibc-not-enabled-error.a -LIBENSCVECTOR = $(LIBENSCVECTOR_GLIBC) endif + +if ENSC_USE_DIETLIBC +LIBENSCVECTOR = $(LIBENSCVECTOR_DIET) +else !ENSC_USE_DIETLIBC +if ENSC_USE_GLIBC +LIBENSCVECTOR = $(LIBENSCVECTOR_GLIBC) +else !ENSC_USE_GLIBC +LIBENSCVECTOR = lib-nolib-enabled-error.a +endif !ENSC_USE_GLIBC +endif !ENSC_USE_DIETLIBC + CLEANFILES += libensc_vector-diet.a \ libensc_vector-glibc.a -- 1.8.1.5