X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Flib_internal%2FMakefile-files;h=77be61372358e15edfb57538c9ec448672d9ac52;hb=2b4a53c0516fcbddbdab9d82bb6519fd04fecbae;hp=2f82c2b2edb15e8772e4d78a7afed3b38309e37d;hpb=319929791248f823537ac5fb2fe10a01b5b820b9;p=util-vserver.git diff --git a/util-vserver/lib_internal/Makefile-files b/util-vserver/lib_internal/Makefile-files index 2f82c2b..77be613 100644 --- a/util-vserver/lib_internal/Makefile-files +++ b/util-vserver/lib_internal/Makefile-files @@ -17,7 +17,22 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## + +LIBINTERNAL_GLIBC = lib_internal/libinternal-glibc.a +noinst_LIBRARIES += $(LIBINTERNAL_GLIBC) + +if USE_DIETLIBC +LIBINTERNAL_DIET = lib_internal/libinternal-diet.a +LIBINTERNAL = $(LIBINTERNAL_DIET) +noinst_LIBRARIES += $(LIBINTERNAL_DIET) +else +LIBINTERNAL_DIET = lib-dietlibc-not-enabled-error.a +LIBINTERNAL = $(LIBINTERNAL_GLIBC) +endif + + command_SRCS = lib_internal/command-appendparameter.c \ + lib_internal/command-setparams.c \ lib_internal/command-exec.c\ lib_internal/command-free.c \ lib_internal/command-init.c \ @@ -25,14 +40,21 @@ command_SRCS = lib_internal/command-appendparameter.c \ lib_internal/command-wait.c \ lib_internal/command.h +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 +endif -noinst_LIBRARIES += lib_internal/libinternal.a noinst_HEADERS += \ lib_internal/coreassert.h \ + lib_internal/errinfo.h \ lib_internal/jail.h \ lib_internal/matchlist.h \ lib_internal/pathinfo.h \ lib_internal/string.h \ + lib_internal/sys_clone.h \ lib_internal/unify.h \ lib_internal/util.h \ lib_internal/util-cast.h \ @@ -43,13 +65,15 @@ noinst_HEADERS += \ lib_internal/util-dotfile.h \ lib_internal/util-exitlikeprocess.h \ lib_internal/util-io.h \ + lib_internal/util-lockfile.h \ lib_internal/util-mem.h \ lib_internal/util-perror.h \ lib_internal/util-safechdir.h \ lib_internal/util-unixsock.h \ lib_internal/string.hc -lib_internal_libinternal_a_SOURCES = \ +lib_internal_libinternal_common_SRCS = \ + lib_internal/errinfo-writeerrno.c \ lib_internal/jailintotempdir.c \ lib_internal/matchlist-appendfiles.c \ lib_internal/matchlist-compare.c \ @@ -59,19 +83,32 @@ lib_internal_libinternal_a_SOURCES = \ 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/string-destroy.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 \ + lib_internal/unify-isiunlinkable.c \ + lib_internal/util-canonify.c \ lib_internal/util-exitlikeprocess.c \ + lib_internal/util-lockfile.c \ lib_internal/util-safechdir.c \ - $(command_SRCS) + $(command_SRCS) \ + $(filecfg_SRCS) + +lib_internal_libinternal_diet_a_SOURCES = \ + $(lib_internal_libinternal_common_SRCS) + +lib_internal_libinternal_glibc_a_SOURCES = \ + $(lib_internal_libinternal_common_SRCS) -DIETPROGS += lib_internal/libinternal.a +lib_internal_libinternal_diet_a_CPPFLAGS = $(AM_CPPFLAGS) $(LIB_DEBUG_CPPFLAGS) +lib_internal_libinternal_glibc_a_CPPFLAGS = $(AM_CPPFLAGS) $(LIB_DEBUG_CPPFLAGS) +DIETPROGS += lib_internal/libinternal-diet.a include $(top_srcdir)/lib_internal/testsuite/Makefile-files