split into a -glibc and a -diet part
authorEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Fri, 18 Mar 2005 00:15:10 +0000 (00:15 +0000)
committerEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Fri, 18 Mar 2005 00:15:10 +0000 (00:15 +0000)
git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1908 94cd875c-1c1d-0410-91d2-eb244daf1a30

util-vserver/ensc_vector/Makefile-files
util-vserver/lib/Makefile-files

index 98e5f6d..7cda7dc 100644 (file)
@@ -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
index 3135b39..5353f1a 100644 (file)
@@ -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