X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Flib%2FMakefile-files;h=5353f1ac7228df1b37aeee085bca0b2499f9128d;hb=3b8f8fa40a253c7414a6f46c041bf6da45cb464c;hp=81ba44f29c7316e3e9dbe9185622b1e0af8e3bd7;hpb=cd5f5206059af3e6e8273ceed47479c6bffa4c91;p=util-vserver.git diff --git a/util-vserver/lib/Makefile-files b/util-vserver/lib/Makefile-files index 81ba44f..5353f1a 100644 --- a/util-vserver/lib/Makefile-files +++ b/util-vserver/lib/Makefile-files @@ -41,60 +41,68 @@ lib_v13_SRCS = lib/syscall_ctxcreate.c \ lib/syscall_ctxcreate-v13.hc \ lib/syscall_ctxmigrate.c \ lib/syscall_ctxmigrate-v13.hc \ - lib/syscall_enternamespace.c \ - lib/syscall_enternamespace-v13.hc \ - lib/syscall_setnamespace.c \ - lib/syscall_setnamespace-v13.hc \ - lib/syscall_cleanupnamespace.c \ + lib/syscall_adddlimit-v13.hc \ + lib/syscall_adddlimit.c \ lib/syscall_cleanupnamespace-v13.hc \ - lib/syscall_getiattr.c \ + lib/syscall_cleanupnamespace.c \ + lib/syscall_enternamespace-v13.hc \ + lib/syscall_enternamespace.c \ + lib/syscall_getccaps-v13.hc \ + 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_setiattr.c \ - lib/syscall_setiattr-fscompat.hc \ - lib/syscall_setiattr-v13.hc \ - lib/syscall_gettasknid.c \ + lib/syscall_getiattr.c \ + lib/syscall_getncaps-net.hc \ + lib/syscall_getncaps.c \ + lib/syscall_getnflags-net.hc \ + lib/syscall_getnflags.c \ + lib/syscall_getnxinfo-net.hc \ + lib/syscall_getnxinfo.c \ lib/syscall_gettasknid-net.hc \ - lib/syscall_gettaskxid.c \ - lib/syscall_gettaskxid-v13.hc \ + lib/syscall_gettasknid.c \ lib/syscall_gettaskxid-oldproc.hc \ - lib/syscall_getnxinfo.c \ - lib/syscall_getnxinfo-net.hc \ - lib/syscall_getvxinfo.c \ - lib/syscall_getvxinfo-v13.hc \ - lib/syscall_getvxinfo-oldproc.hc \ - lib/syscall_getvhiname.c \ - lib/syscall_getvhiname-v13.hc \ + lib/syscall_gettaskxid-v13.hc \ + lib/syscall_gettaskxid.c \ lib/syscall_getvhiname-olduts.hc \ - lib/syscall_setvhiname.c \ - lib/syscall_setvhiname-v13.hc \ - lib/syscall_setvhiname-olduts.hc \ - lib/syscall_getccaps.c \ - lib/syscall_getccaps-v13.hc \ - lib/syscall_getcflags.c \ - lib/syscall_getcflags-v13.hc \ - lib/syscall_getncaps.c \ - lib/syscall_getncaps-net.hc \ - lib/syscall_getnflags.c \ - lib/syscall_getnflags-net.hc \ + lib/syscall_getvhiname-v13.hc \ + lib/syscall_getvhiname.c \ + lib/syscall_getvxinfo-oldproc.hc \ + lib/syscall_getvxinfo-v13.hc \ + lib/syscall_getvxinfo.c \ lib/syscall_netadd-net.hc \ lib/syscall_netadd.c \ - lib/syscall_netremove-net.hc \ - lib/syscall_netremove.c \ - lib/syscall_netcreate.c \ lib/syscall_netcreate-net.hc \ - lib/syscall_netmigrate.c \ + lib/syscall_netcreate.c \ lib/syscall_netmigrate-net.hc \ - lib/syscall_setccaps.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_setcflags.c \ + lib/syscall_setccaps.c \ lib/syscall_setcflags-v13.hc \ - lib/syscall_setncaps.c \ + 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 \ + lib/syscall_setnamespace-v13.hc \ + lib/syscall_setnamespace.c \ lib/syscall_setncaps-net.hc \ - lib/syscall_setnflags.c \ + lib/syscall_setncaps.c \ lib/syscall_setnflags-net.hc \ - lib/syscall_setsched.c \ + lib/syscall_setnflags.c \ lib/syscall_setsched-v13.hc \ + lib/syscall_setsched.c \ + lib/syscall_setvhiname-olduts.hc \ + lib/syscall_setvhiname-v13.hc \ + lib/syscall_setvhiname.c \ lib/bcaps-v13.c \ lib/bcaps_list-v13.c \ lib/ccaps-v13.c \ @@ -111,19 +119,20 @@ PKGCONFIG_FILES = lib/util-vserver lib_SRCS = lib/syscall.c \ lib/checkversion.c \ lib/isdirectory.c \ + lib/isfile.c \ + lib/islink.c \ lib/getnbipv4root.c \ lib/getversion.c \ - lib/fmt-32.c \ - lib/fmt-64.c \ - lib/fmtx-32.c \ - lib/fmtx-64.c \ lib/capabilities.c \ + lib/getfilecontext.c \ lib/getinsecurebcaps.c \ + lib/getxidtype.c \ lib/isdynamicxid.c \ lib/issupported.c \ lib/issupportedstring.c \ lib/listparser_uint32.c \ lib/listparser_uint64.c \ + lib/syscall-syscall.c \ lib/val2text-t2v-uint32.c \ lib/val2text-t2v-uint64.c \ lib/val2text-v2t-uint32.c \ @@ -133,7 +142,8 @@ lib_SRCS = lib/syscall.c \ $(lib_compat_SRCS) \ $(lib_management_SRCS) \ $(lib_v11_SRCS) \ - $(lib_v13_SRCS) + $(lib_v13_SRCS) \ + $(ensc_fmt_SRCS) include_HEADERS += lib/vserver.h @@ -141,6 +151,7 @@ noinst_HEADERS += lib/syscall-compat.hc \ lib/syscall-legacy.hc \ lib/createskeleton-full.hc \ lib/createskeleton-short.hc \ + lib/fmt.h \ lib/getversion-internal.hc \ lib/safechroot-internal.hc \ lib/ioctl-getext2flags.hc \ @@ -150,10 +161,6 @@ noinst_HEADERS += lib/syscall-compat.hc \ lib/ioctl-getxflg.hc \ lib/ioctl-setxflg.hc \ lib/ext2fs.h \ - lib/fmt.h \ - lib/fmt.hc \ - lib/fmtx.hc \ - lib/fmt-internal.h \ lib/listparser.hc \ lib/val2text.hc \ lib/virtual.h \ @@ -161,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) -D_REENTRANT -D_GNU_SOURCE +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