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=abda326beda289e9deabac91ec422315b069b06f;hp=a8e4e6de273d8011f2fdf31b9a88d4048c067034;hpb=90698e2423b39e33474328b226f7aca04b066309;p=util-vserver.git diff --git a/util-vserver/lib_internal/Makefile-files b/util-vserver/lib_internal/Makefile-files index a8e4e6d..77be613 100644 --- a/util-vserver/lib_internal/Makefile-files +++ b/util-vserver/lib_internal/Makefile-files @@ -17,6 +17,20 @@ ## 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\ @@ -33,7 +47,6 @@ filecfg_SRCS = lib_internal/filecfg.h \ lib_internal/filecfg-readentrystr.c endif -noinst_LIBRARIES += lib_internal/libinternal.a noinst_HEADERS += \ lib_internal/coreassert.h \ lib_internal/errinfo.h \ @@ -59,7 +72,7 @@ noinst_HEADERS += \ 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 \ @@ -70,14 +83,16 @@ 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 \ @@ -85,7 +100,15 @@ lib_internal_libinternal_a_SOURCES = \ $(command_SRCS) \ $(filecfg_SRCS) -DIETPROGS += lib_internal/libinternal.a +lib_internal_libinternal_diet_a_SOURCES = \ + $(lib_internal_libinternal_common_SRCS) + +lib_internal_libinternal_glibc_a_SOURCES = \ + $(lib_internal_libinternal_common_SRCS) + +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