From: Enrico Scholz Date: Sat, 19 Mar 2005 02:05:02 +0000 (+0000) Subject: moved *dlimit* files into the only-C99 section X-Git-Tag: IPSENTINEL_VERSION_0_12~58 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e208ad853d689b2b6110bf4012f7c02478c9c4be;p=util-vserver.git moved *dlimit* files into the only-C99 section clean all potentially built libraries git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1936 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/lib/Makefile-files b/util-vserver/lib/Makefile-files index 5353f1a..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 \ @@ -189,5 +192,8 @@ 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 diff --git a/util-vserver/lib_internal/Makefile-files b/util-vserver/lib_internal/Makefile-files index 77be613..c74ed6b 100644 --- a/util-vserver/lib_internal/Makefile-files +++ b/util-vserver/lib_internal/Makefile-files @@ -44,7 +44,10 @@ if ENSC_HAVE_C99_COMPILER filecfg_SRCS = lib_internal/filecfg.h \ lib_internal/filecfg-iteratemultiline.c \ lib_internal/filecfg-readentryflag.c \ - lib_internal/filecfg-readentrystr.c + lib_internal/filecfg-readentrystr.c \ + lib_internal/matchlist-initbyvserver.c \ + lib_internal/matchvserverinfo-init.c \ + lib_internal/unify-copy.c endif noinst_HEADERS += \ @@ -79,16 +82,13 @@ lib_internal_libinternal_common_SRCS = \ lib_internal/matchlist-compare.c \ lib_internal/matchlist-destroy.c \ lib_internal/matchlist-init.c \ - lib_internal/matchlist-initbyvserver.c \ lib_internal/matchlist-initmanually.c \ lib_internal/matchlist-initrefserverlist.c \ lib_internal/matchlist-printid.c \ - lib_internal/matchvserverinfo-init.c \ lib_internal/matchvserverinfo-free.c \ lib_internal/pathinfo-append.c \ lib_internal/pathinfo-test.c \ lib_internal/switchtowatchxid.c \ - lib_internal/unify-copy.c \ lib_internal/unify-deunify.c \ lib_internal/unify-settime.c \ lib_internal/unify-unify.c \ @@ -111,4 +111,7 @@ lib_internal_libinternal_glibc_a_CPPFLAGS = $(AM_CPPFLAGS) $(LIB_DEBUG_CPPFLAGS) DIETPROGS += lib_internal/libinternal-diet.a +CLEANFILES += lib_internal/libinternal-diet.a \ + lib_internal/libinternal-glibc.a + include $(top_srcdir)/lib_internal/testsuite/Makefile-files