From e85465c7fdf33be0e54784d8bc2d48e09d1d8efc Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Wed, 16 Jun 2004 10:07:52 +0000 Subject: [PATCH] moved fmt* functionality into the 'ensc_fmt' module removed '-D_REENTRANT' as it is defined globally git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1584 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/lib/Makefile-files | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/util-vserver/lib/Makefile-files b/util-vserver/lib/Makefile-files index 81ba44f..f847f68 100644 --- a/util-vserver/lib/Makefile-files +++ b/util-vserver/lib/Makefile-files @@ -113,10 +113,6 @@ lib_SRCS = lib/syscall.c \ lib/isdirectory.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/getinsecurebcaps.c \ lib/isdynamicxid.c \ @@ -133,7 +129,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 +138,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 +148,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 \ @@ -164,7 +158,7 @@ noinst_HEADERS += lib/syscall-compat.hc \ lib_LTLIBRARIES += lib/libvserver.la 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-% \ -- 1.8.1.5