X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Flib%2FMakefile-files;h=94d0e9f84d0595ad2c60a3d05d67175a36f35e9e;hb=3eb1b2279739d0f16391a3724a9897c686f030d3;hp=88f586a4f5de3f740ecab78550dccc520dcc1b35;hpb=9c1daa8ad9c98e670bfa76577ae242be16039aa3;p=util-vserver.git diff --git a/util-vserver/lib/Makefile-files b/util-vserver/lib/Makefile-files index 88f586a..94d0e9f 100644 --- a/util-vserver/lib/Makefile-files +++ b/util-vserver/lib/Makefile-files @@ -41,8 +41,6 @@ lib_v13_SRCS = lib/syscall_ctxcreate.c \ lib/syscall_ctxcreate-v13.hc \ lib/syscall_ctxmigrate.c \ lib/syscall_ctxmigrate-v13.hc \ - lib/syscall_adddlimit-v13.hc \ - lib/syscall_adddlimit.c \ lib/syscall_cleanupnamespace-v13.hc \ lib/syscall_cleanupnamespace.c \ lib/syscall_enternamespace-v13.hc \ @@ -51,8 +49,6 @@ lib_v13_SRCS = lib/syscall_ctxcreate.c \ lib/syscall_getccaps.c \ lib/syscall_getcflags-v13.hc \ lib/syscall_getcflags.c \ - lib/syscall_getdlimit-v13.hc \ - lib/syscall_getdlimit.c \ lib/syscall_getiattr-fscompat.hc \ lib/syscall_getiattr-v13.hc \ lib/syscall_getiattr.c \ @@ -81,14 +77,10 @@ lib_v13_SRCS = lib/syscall_ctxcreate.c \ lib/syscall_netmigrate.c \ lib/syscall_netremove-net.hc \ lib/syscall_netremove.c \ - lib/syscall_remdlimit-v13.hc \ - lib/syscall_remdlimit.c \ lib/syscall_setccaps-v13.hc \ lib/syscall_setccaps.c \ lib/syscall_setcflags-v13.hc \ lib/syscall_setcflags.c \ - lib/syscall_setdlimit-v13.hc \ - lib/syscall_setdlimit.c \ lib/syscall_setiattr-fscompat.hc \ lib/syscall_setiattr-v13.hc \ lib/syscall_setiattr.c \ @@ -114,6 +106,17 @@ lib_v13_SRCS = lib/syscall_ctxcreate.c \ lib/nflags-net.c \ lib/nflags_list-net.c +if ENSC_HAVE_C99_COMPILER +lib_v13_SRCS += lib/syscall_adddlimit-v13.hc \ + lib/syscall_adddlimit.c \ + lib/syscall_getdlimit-v13.hc \ + lib/syscall_getdlimit.c \ + lib/syscall_remdlimit-v13.hc \ + lib/syscall_remdlimit.c \ + lib/syscall_setdlimit-v13.hc \ + lib/syscall_setdlimit.c +endif + PKGCONFIG_FILES = lib/util-vserver lib_SRCS = lib/syscall.c \ @@ -126,6 +129,7 @@ lib_SRCS = lib/syscall.c \ lib/capabilities.c \ lib/getfilecontext.c \ lib/getinsecurebcaps.c \ + lib/getxidtype.c \ lib/isdynamicxid.c \ lib/issupported.c \ lib/issupportedstring.c \ @@ -167,15 +171,29 @@ 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-% + +CLEANFILES += lib/libvserver.la \ + lib/libvserver.a include $(srcdir)/lib/apidoc/Makefile-files include $(srcdir)/lib/testsuite/Makefile-files