X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=28f763434a306d5cc07b75043c061848539238ff;hb=f568facfa81f6847df3bc91bb5d16af3d2a0871b;hp=e658058673981f0b612c3a904f90a96b93413e8f;hpb=eff7f4e4ad7a7a2bf599f652e479ef92cf530702;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index e658058..28f7634 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -51,7 +51,7 @@ noinst_DATA = initrd_SCRIPTS = sysconf_DATA = -DIETPROGS = $(ENSC_VECTOR_LIBS) +DIETPROGS = $(LIBENSCVECTOR_DIET) BUILT_SOURCES = pathconfig.h linuxvirtual.h \ .fixups @@ -75,17 +75,19 @@ kernel_HDRS = kernel/context.h \ EXTRA_PROGRAMS = EXTRA_DIST = pathconfig.h.pathsubst \ util-vserver.spec \ - THANKS \ + THANKS REQUIREMENTS \ $(kernel_HDRS) check_PROGRAMS = check_SCRIPTS = -TESTS = -TESTS_ENVIRONMENT = +TESTS_DEBUG = no +TESTS = +TESTS_ENVIRONMENT = ensc_use_expensive_tests="$(ENSC_USE_EXPENSIVE_TESTS)" \ + ensc_test_debug="$(TESTS_DEBUG)" -AM_CPPFLAGS = -I $(top_srcdir)/lib -I $(top_srcdir)/ensc_wrappers \ - -D_GNU_SOURCE -D_REENTRANT $(RELEASE_CPPFLAGS) +AM_CPPFLAGS = -I $(top_srcdir)/lib -I $(top_srcdir)/ensc_wrappers \ + -D_GNU_SOURCE -D_REENTRANT $(RELEASE_CPPFLAGS) CLEANFILES = $(BUILT_SOURCES) \ .*.pathsubst.stamp */.*.pathsubst.stamp */*/.*.pathsubst.stamp \ @@ -97,9 +99,7 @@ DISTCLEANFILES = FEATURES.txt AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = if USE_DIETLIBC -DIET = diet -DIET_FLAGS = -DIET_CC := $(DIET) $(DIET_FLAGS) $(CC) +DIET_CC := $(DIET) $(DIETFLAGS) $(CC) VSERVER_LDFLGS := -static else VSERVER_LDFLGS := @@ -111,7 +111,7 @@ else DIET_COMPAT_LDADDS = endif -VSERVER_LDADDS = lib/libvserver.la $(DIET_COMPAT_LDADDS) +VSERVER_LDADDS = $(LIBVSERVER) $(DIET_COMPAT_LDADDS) silent.%: FORCE @t=$$(mktemp /tmp/build.XXXXXX) && \ @@ -175,7 +175,7 @@ pathconfig.h: .pathconfig.h.pathsubst.stamp @touch '$@' pkgstatedir = $(localstatedir)/run/vservers -pkgstaterevdir = $(pkgstatedir).rev +pkgstaterevdir = $(confdefaultsdir)/run.rev vserverpkgdir = $(vserverdir)/.pkg vshelperstatedir = $(localstatedir)/run/vshelper @@ -190,10 +190,10 @@ update-doc: doc install-data-hook: install-fix-script-paths install-create-dirs install-create-dirs: - $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgstatedir) $(DESTDIR)$(pkgstaterevdir) $(DESTDIR)$(vshelperstatedir) + $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgstatedir) $(DESTDIR)$(pkgstatedir).rev $(DESTDIR)$(vshelperstatedir) $(mkinstalldirs) -m 755 $(DESTDIR)$(confdefaultsdir) - f=$(DESTDIR)$(confdefaultsdir)/vdirbase; test -e "$$f" || ln -sf '$(vserverdir)' "$$f" - f=$(DESTDIR)$(confdefaultsdir)/run.rev; test -e "$$f" || ln -sf '$(pkgstaterevdir)' "$$f" + f=$(DESTDIR)$(confdefaultsdir)/vdirbase; test -e "$$f" || ln -sf '$(vserverdir)' "$$f" + f=$(DESTDIR)$(pkgstaterevdir); test -e "$$f" || ln -sf '$(pkgstatedir).rev' "$$f" install-fix-script-paths: test "/usr/lib/util-vserver" = "$(pkglibdir)" || \ @@ -221,6 +221,9 @@ if USE_DIETLIBC $(addsuffix $(EXEEXT), $(DIETPROGS)) \ $(addsuffix $(OBJEXT), $(DIETPROGS)) \ : CC=$(DIET_CC) +else !USE_DIETLIBC +nodist_lib_dietlibc_not_enabled_error_a_SOURCES = \ + lib-dietlibc-not-enabled-error.c endif include $(top_srcdir)/lib/Makefile-files