From: Enrico Scholz Date: Fri, 18 Mar 2005 00:15:10 +0000 (+0000) Subject: split into a -glibc and a -diet part X-Git-Tag: IPSENTINEL_VERSION_0_12~86 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=281308f4b618667a03d1f06e2f4457fc79f03bfc;p=util-vserver.git split into a -glibc and a -diet part git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1908 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/ensc_vector/Makefile-files b/util-vserver/ensc_vector/Makefile-files index 98e5f6d..7cda7dc 100644 --- a/util-vserver/ensc_vector/Makefile-files +++ b/util-vserver/ensc_vector/Makefile-files @@ -43,7 +43,23 @@ ENSC_VECTOR_HDRS = ensc_vector/vector.h \ ensc_vector/list.h \ ensc_vector/list.hc -ENSC_VECTOR_LIBS = libensc_vector.a -libensc_vector_a_SOURCES = $(ENSC_VECTOR_SRCS) +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) + +libensc_vector_diet_a_SOURCES = $(ENSC_VECTOR_SRCS) +libensc_vector_diet_a_CPPFLAGS = $(AM_CPPFLAGS) + +if USE_DIETLIBC +LIBENSCVECTOR_DIET = libensc_vector-diet.a +LIBENSCVECTOR = $(LIBENSCVECTOR_DIET) +ENSC_VECTOR_LIBS += $(LIBENSCVECTOR_DIET) +else +LIBENSCVECTOR_DIET = lib-ensc_vector-diet-not-available.a +LIBENSCVECTOR = $(LIBENSCVECTOR_GLIBC) +endif + include $(srcdir)/ensc_vector/testsuite/Makefile-files diff --git a/util-vserver/lib/Makefile-files b/util-vserver/lib/Makefile-files index 3135b39..5353f1a 100644 --- a/util-vserver/lib/Makefile-files +++ b/util-vserver/lib/Makefile-files @@ -168,15 +168,26 @@ noinst_HEADERS += lib/syscall-compat.hc \ lib/utils-legacy.h \ lib/vserver-internal.h -lib_LTLIBRARIES += lib/libvserver.la +LIBVSERVER_GLIBC = lib/libvserver.la +lib_LTLIBRARIES += $(LIBVSERVER_GLIBC) + +if USE_DIETLIBC +LIBVSERVER_DIET = lib/libvserver.a +LIBVSERVER = $(LIBVSERVER_DIET) +lib_LIBRARIES += $(LIBVSERVER_DIET) +else +LIBVSERVER_DIET = lib-dietlibc-not-enabled-error.a +LIBVSERVER = lib/libvserver.la +endif lib_libvserver_la_SOURCES = $(lib_SRCS) lib_libvserver_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIB_DEBUG_CPPFLAGS) lib_libvserver_la_LDFLAGS = -version $(lib_VERSION) -DIETPROGS += lib/lib_libvserver_la-% \ - lib/lib_libvserver_a-% \ - lib/lib_libvserver_pic_a-% +lib_libvserver_a_SOURCES = $(lib_SRCS) +lib_libvserver_a_CPPFLAGS = $(AM_CPPFLAGS) $(LIB_DEBUG_CPPFLAGS) + +DIETPROGS += lib/lib_libvserver_a-% include $(srcdir)/lib/apidoc/Makefile-files include $(srcdir)/lib/testsuite/Makefile-files