X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=5f0b6e25f235e2f90bb29992d2e98596a8c2aad7;hb=3eb1b2279739d0f16391a3724a9897c686f030d3;hp=b26bc23174a5489c1ebbb76f2c9d23d9f004068b;hpb=ccaabe284476ebd1f6e77813c95adb68d73eaf45;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index b26bc23..5f0b6e2 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -51,9 +51,9 @@ noinst_DATA = initrd_SCRIPTS = sysconf_DATA = -DIETPROGS = $(ENSC_VECTOR_LIBS) +DIETPROGS = $(LIBENSCVECTOR_DIET) -BUILT_SOURCES = linuxcaps.h pathconfig.h linuxvirtual.h \ +BUILT_SOURCES = pathconfig.h linuxvirtual.h \ .fixups man_MANS = @@ -80,16 +80,18 @@ EXTRA_DIST = pathconfig.h.pathsubst \ 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 \ - linuxcaps.h pathconfig.h .fixups + pathconfig.h .fixups DISTCLEANFILES = FEATURES.txt @@ -111,7 +113,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) && \ @@ -123,14 +125,6 @@ silent.%: FORCE grep -v 'warning: #warning'; \ rm -f $$t || : ) -linuxcaps.h: ${kernelincludedir}/linux/capability.h Makefile - @rm -f $@ - echo '#include ' >$@.tmp - $(SED) -e 's!^#include .*!!g;' $< >>$@.tmp - @-chmod --reference $< $@.tmp &>/dev/null - mv -f $@.tmp $@ - @chmod a-w $@ - linuxvirtual.h: if ENSC_ENABLE_INTERNAL_HEADERS @@ -161,27 +155,11 @@ pathsubst_RULES = s!@'PKGLIBDIR'@!$(pkglibdir)!g; \ s!@'PACKAGE_STRING'@!$(PACKAGE_STRING)!g; \ s!@'PACKAGE_TARNAME'@!$(PACKAGE_TARNAME)!g; \ s!@'PACKAGE_VERSION'@!$(PACKAGE_VERSION)!g; \ - s!@'AWK'@!$(AWK)!g; \ - s!@'ENV'@!$(ENV)!g; \ - s!@'GREP'@!$(GREP)!g; \ - s!@'IP'@!$(IP)!g; \ - s!@'IPTABLES'@!$(IPTABLES)!g; \ - s!@'MODPROBE'@!$(MODPROBE)!g; \ - s!@'MOUNT'@!$(MOUNT)!g; \ - s!@'NAMEIF'@!$(NAMEIF)!g; \ - s!@'NICE'@!$(NICE)!g; \ - s!@'PS'@!$(PS)!g; \ - s!@'RMMOD'@!$(RMMOD)!g; \ - s!@'TAR'@!$(TAR)!g; \ - s!@'UMOUNT'@!$(UMOUNT)!g; \ - s!@'VCONFIG'@!$(VCONFIG)!g; \ - s!@'WC'@!$(WC)!g; \ - s!@'WGET'@!$(WGET)!g; \ - s!@'XSLTPROC'@!$(XSLTPROC)!g; \ s!@'ENSC_HAVE_C99_COMPILER_TRUE'@!\@ENSC_HAVE_C99_COMPILER_TRUE@ !g; \ s!@'ENSC_HAVE_C99_COMPILER_FALSE'@!\@ENSC_HAVE_C99_COMPILER_FALSE@ !g; \ s!@'ENSC_HAVE_CXX_COMPILER_TRUE'@!\@ENSC_HAVE_CXX_COMPILER_TRUE@ !g; \ - s!@'ENSC_HAVE_CXX_COMPILER_FALSE'@!\@ENSC_HAVE_CXX_COMPILER_FALSE@ !g; + s!@'ENSC_HAVE_CXX_COMPILER_FALSE'@!\@ENSC_HAVE_CXX_COMPILER_FALSE@ !g; \ + $(ENSC_PATHPROG_SED) pathconfig.h: .pathconfig.h.pathsubst.stamp .%.pathsubst.stamp: %.pathsubst Makefile @@ -199,7 +177,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 @@ -208,13 +186,16 @@ fix_SCRPTS = $(addprefix $(pkglibdir)/, $(notdir $(pkglib_SCRIPTS))) \ $(addprefix $(sbindir)/, $(notdir $(sbin_SCRIPTS))) \ $(addprefix $(initrddir)/, $(notdir $(initrd_SCRIPTS))) +update-doc: doc + $(top_srcdir)/update-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)" || \ @@ -242,6 +223,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 @@ -263,4 +247,4 @@ include $(top_srcdir)/m4/validate.am include $(top_srcdir)/m4/changelog.am include $(top_srcdir)/m4/pkgconfig.am -.PHONY: FORCE +.PHONY: FORCE update-doc