X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Flib%2FMakefile-files;h=1c13e168305df7eb89e1a46b954507fd4df85cf9;hb=2cf63bb23068c7a5ff8cdd7a865210436dda6f12;hp=7513b355bac8ad3e029a64236700402b8b7cfb77;hpb=40730f8dcef5467014a2cb830aa03bd800d6056c;p=util-vserver.git diff --git a/util-vserver/lib/Makefile-files b/util-vserver/lib/Makefile-files index 7513b35..1c13e16 100644 --- a/util-vserver/lib/Makefile-files +++ b/util-vserver/lib/Makefile-files @@ -17,54 +17,103 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## -lib_legacy_SRCS = lib/getprocentry-legacy.c -lib_management_SRCS = lib/getvservername.c \ - lib/getvservercfgstyle.c \ - lib/getvservervdir.c -lib_v11_SRCS = lib/syscall_rlimit.c +lib_VERSION = 0.0.0 -PKGCONFIG_FILES = lib/util-vserver +lib_legacy_SRCS = lib/getprocentry-legacy.c +lib_management_SRCS = lib/createskeleton.c \ + lib/getvserverbyctx.c \ + lib/getvservercfgstyle.c \ + lib/getvserverappdir.c \ + lib/getvservercfgdir.c \ + lib/getvserverctx.c \ + lib/getvservername.c \ + lib/getvservervdir.c +lib_v11_SRCS = lib/syscall_rlimit.c \ + lib/syscall_rlimit-v11.hc \ + lib/syscall_kill.c \ + lib/syscall_kill-v11.hc +lib_v13_SRCS = lib/syscall_enternamespace.c \ + lib/syscall_enternamespace-v13.hc \ + lib/syscall_getiattr.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_gettaskxid.c \ + lib/syscall_gettaskxid-v13.hc \ + lib/syscall_gettaskxid-oldproc.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_getvhiname-olduts.hc \ + lib/syscall_setvhiname.c \ + lib/syscall_setvhiname-v13.hc \ + lib/syscall_setvhiname-olduts.hc -lib_SRCS = lib/syscall.c \ - lib/checkversion.c \ - lib/getctx.c \ - lib/getinitpid.c \ - lib/getversion.c \ - lib/fmt-32.c \ - lib/fmt-64.c \ - lib/capabilities.c \ - $(lib_legacy_SRCS) \ - $(lib_management_SRCS) \ - $(lib_v11_SRCS) +PKGCONFIG_FILES = lib/util-vserver -lib_HDRS = lib/vserver.h +lib_SRCS = lib/syscall.c \ + lib/checkversion.c \ + lib/isdirectory.c \ + lib/getversion.c \ + lib/fmt-32.c \ + lib/fmt-64.c \ + lib/fmtx-32.c \ + lib/fmtx-64.c \ + lib/capabilities.c \ + lib/flags.c \ + lib/flags_list.c \ + $(lib_legacy_SRCS) \ + $(lib_management_SRCS) \ + $(lib_v11_SRCS) \ + $(lib_v13_SRCS) -lib_XHDRS = lib/syscall-compat.hc \ - lib/syscall-legacy.hc \ - lib/syscall_rlimit-v11.hc \ - lib/getctx-compat.hc \ - lib/getctx-legacy.hc \ - lib/getinitpid-compat.hc \ - lib/getinitpid-legacy.hc \ - lib/getversion-internal.hc \ - lib/safechroot-internal.hc \ - lib/fmt.hc \ - lib/fmt.h \ - lib/virtual.h \ - lib/internal.h \ - lib/utils-legacy.h \ - lib/vserver-internal.h +lib_HDRS = lib/vserver.h -lib_lib_LIBS = lib/libvserver.a +lib_XHDRS = lib/syscall-compat.hc \ + lib/syscall-legacy.hc \ + lib/createskeleton-full.hc \ + lib/createskeleton-short.hc \ + lib/getversion-internal.hc \ + lib/safechroot-internal.hc \ + lib/ioctl-getext2flags.hc \ + lib/ioctl-getfilecontext.hc \ + lib/ioctl-setext2flags.hc \ + lib/ioctl-setfilecontext.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/virtual.h \ + lib/internal.h \ + lib/utils-legacy.h \ + lib/vserver-internal.h + +#lib_lib_LIBS = lib/libvserver.a lib/libvserver-pic.a +lib_lib_LIBS = lib_lib_LTLIBS = lib/libvserver.la #lib_libvserver_la_SOURCES = $(lib_SRCS) -lib_libvserver_a_SOURCES = $(lib_SRCS) -lib_libvserver_a_CPPFLAGS = $(AM_CPPFLAGS) $(LIB_DEBUG_CPPFLAGS) -I$(kernelincludedir) -D_REENTRANT -D_GNU_SOURCE +#lib_libvserver_a_SOURCES = $(lib_SRCS) +#lib_libvserver_a_CPPFLAGS = $(AM_CPPFLAGS) $(LIB_DEBUG_CPPFLAGS) -I$(kernelincludedir) -D_REENTRANT -D_GNU_SOURCE # _REENTRANT is needed for dietlibc to use __error_location -if USE_DIETLIBC -lib/lib_libvserver_a-%$(EXEEXT) lib/lib_libvserver_a-%$(OBJEXT) \ -lib/libvserver.a \ - : CC=$(DIET_CC) -endif +#lib_libvserver_pic_a_SOURCES = $(lib_SRCS) +#lib_libvserver_pic_a_CPPFLAGS = $(lib_libvserver_a_CPPFLAGS) -fPIC + +lib_libvserver_la_SOURCES = $(lib_SRCS) +lib_libvserver_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIB_DEBUG_CPPFLAGS) -I$(kernelincludedir) -D_REENTRANT -D_GNU_SOURCE +lib_libvserver_la_LDFLAGS = -version $(lib_VERSION) + +lib_DIETPROGS = lib/lib_libvserver_la-% \ + lib/lib_libvserver_a-% \ + lib/lib_libvserver_pic_a-% \ + $(lib_testsuite_DIETPROGS) + +include $(srcdir)/lib/testsuite/Makefile-files