X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Flib%2FMakefile-files;h=25cad5f4ad2807180f55e21b493918971f1db334;hb=b38d70e7594b43cdd63b9e27ea5783001ef8407c;hp=7513b355bac8ad3e029a64236700402b8b7cfb77;hpb=40730f8dcef5467014a2cb830aa03bd800d6056c;p=util-vserver.git diff --git a/util-vserver/lib/Makefile-files b/util-vserver/lib/Makefile-files index 7513b35..25cad5f 100644 --- a/util-vserver/lib/Makefile-files +++ b/util-vserver/lib/Makefile-files @@ -17,11 +17,16 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## +lib_VERSION = 0.0.0 + lib_legacy_SRCS = lib/getprocentry-legacy.c -lib_management_SRCS = lib/getvservername.c \ +lib_management_SRCS = lib/getvserverbyctx.c \ lib/getvservercfgstyle.c \ + lib/getvserverctx.c \ + lib/getvservername.c \ lib/getvservervdir.c -lib_v11_SRCS = lib/syscall_rlimit.c +lib_v11_SRCS = lib/syscall_rlimit.c \ + lib/syscall_kill.c PKGCONFIG_FILES = lib/util-vserver @@ -32,6 +37,8 @@ lib_SRCS = lib/syscall.c \ lib/getversion.c \ lib/fmt-32.c \ lib/fmt-64.c \ + lib/fmtx-32.c \ + lib/fmtx-64.c \ lib/capabilities.c \ $(lib_legacy_SRCS) \ $(lib_management_SRCS) \ @@ -42,29 +49,38 @@ lib_HDRS = lib/vserver.h lib_XHDRS = lib/syscall-compat.hc \ lib/syscall-legacy.hc \ lib/syscall_rlimit-v11.hc \ + lib/syscall_kill-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/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_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-%