X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=3f7370cca17d137172e7ef4f23561ebc7d3eba7d;hb=4e6893b5e5cb57b316f4d40a6adb832b19785d19;hp=949f41adcf589267026661c24a615929293ebc98;hpb=13a0b9ce8352499d6200a155bb43da3c03e43933;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 949f41a..3f7370c 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -1,6 +1,6 @@ ## $Id$ -# Copyright (C) 2003,2004 Enrico Scholz +# Copyright (C) 2003,2004,2005,2006 Enrico Scholz # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = . distrib -CVS2CL_AMFLAGS = $(CVS2CL_TAG) -U cvsusers.map --show-dead +CVS2CL_AMFLAGS = $(CVS2CL_TAG) -U cvsusers.map --show-dead -S --no-wrap CVS2CL_ALLFLAGS := $(CVS2CL_AMFLAGS) $(CVS2CL_FLAGS) confdir = $(sysconfdir)/vservers @@ -51,45 +51,62 @@ 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 \ .fixups man_MANS = -kernel_HDRS = kernel/context.h \ - kernel/cvirt.h \ - kernel/debug.h \ - kernel/dlimit.h \ - kernel/inode.h \ - kernel/legacy.h \ - kernel/limit.h \ - kernel/namespace.h \ - kernel/network.h \ - kernel/sched.h \ - kernel/signal.h \ - kernel/switch.h \ +kernel_HDRS = \ + kernel/context.h \ + kernel/context_cmd.h \ + kernel/cvirt.h \ + kernel/cvirt_cmd.h \ + kernel/cvirt_def.h \ + kernel/debug.h \ + kernel/debug_cmd.h \ + kernel/dlimit.h \ + kernel/dlimit_cmd.h \ + kernel/inode.h \ + kernel/inode_cmd.h \ + kernel/legacy.h \ + kernel/limit.h \ + kernel/limit_cmd.h \ + kernel/limit_def.h \ + kernel/namespace.h \ + kernel/namespace_cmd.h \ + kernel/network.h \ + kernel/network_cmd.h \ + kernel/sched.h \ + kernel/sched_cmd.h \ + kernel/sched_def.h \ + kernel/signal_cmd.h \ + kernel/switch.h \ kernel/xid.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 \ - linuxcaps.h pathconfig.h .fixups + pathconfig.h .fixups DISTCLEANFILES = FEATURES.txt @@ -97,9 +114,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,34 +126,19 @@ 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) && \ - $(MAKE) '$*' -s 2>$$t >/dev/null && \ - ( cat $$t | \ - grep -v ': In function' | \ - grep -v 'your code still has assertions enabled' | \ - grep -v ' is obsoleted' | \ - 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 - ln -sf '$(top_srcdir)/lib/virtual.h' '$@' -else - ln -sf '$(kernelincludedir)/linux/virtual.h' '$@' && test -e '$@' || \ - ln -sf '$(top_srcdir)/lib/virtual.h' '$@' -endif + @t=$$($(MKTEMP) -d /tmp/build.XXXXXX) && \ + trap "rm -rf $$t" EXIT && \ + mkfifo $$t/fifo && \ + ( grep --line-buffered -v \ + -e ': In function' \ + -e 'your code still has assertions enabled' \ + -e ' is obsoleted' \ + -e 'warning: #warning' <$$t/fifo & ) && \ + exec 2>$$t/fifo && \ + $(MAKE) '$*' -s >/dev/null pathsubst_RULES = s!@'PKGLIBDIR'@!$(pkglibdir)!g; \ s!@'LEGACYDIR'@!$(legacydir)!g; \ @@ -146,6 +146,7 @@ pathsubst_RULES = s!@'PKGLIBDIR'@!$(pkglibdir)!g; \ s!@'CONFDIR'@!$(confdir)!g; \ s!@'SYSCONFDIR'@!$(sysconfdir)!g; \ s!@'PKGSTATEDIR'@!$(pkgstatedir)!g; \ + s!@'PKGCACHEDIR'@!$(pkgcachedir)!g; \ s!@'PKGSTATEREVDIR'@!$(pkgstaterevdir)!g; \ s!@'VSERVERDIR'@!$(vserverdir)!g; \ s!@'VSERVERPKGDIR'@!$(vserverpkgdir)!g; \ @@ -182,8 +183,9 @@ pathconfig.h: .pathconfig.h.pathsubst.stamp @chmod a-w '$*' @touch '$@' +pkgcachedir = $(localstatedir)/cache/vservers pkgstatedir = $(localstatedir)/run/vservers -pkgstaterevdir = $(pkgstatedir).rev +pkgstaterevdir = $(confdefaultsdir)/run.rev vserverpkgdir = $(vserverdir)/.pkg vshelperstatedir = $(localstatedir)/run/vshelper @@ -198,10 +200,12 @@ 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)$(confdefaultsdir) - f=$(DESTDIR)$(confdefaultsdir)/vdirbase; test -e "$$f" || ln -sf '$(vserverdir)' "$$f" - f=$(DESTDIR)$(confdefaultsdir)/run.rev; test -e "$$f" || ln -sf '$(pkgstaterevdir)' "$$f" + $(mkinstalldirs) -m 0755 $(DESTDIR)$(pkgstatedir) $(DESTDIR)$(pkgstatedir).rev $(DESTDIR)$(vshelperstatedir) + $(mkinstalldirs) -m 0700 $(DESTDIR)$(pkgcachedir) + $(mkinstalldirs) -m 0755 $(DESTDIR)$(confdefaultsdir) + f=$(DESTDIR)$(confdefaultsdir)/vdirbase; test -e "$$f" || ln -sf '$(vserverdir)' "$$f" + f=$(DESTDIR)$(confdefaultsdir)/cachebase; test -e "$$f" || ln -sf '$(pkgcachedir)' "$$f" + f=$(DESTDIR)$(pkgstaterevdir); test -e "$$f" || ln -sf '$(pkgstatedir).rev' "$$f" install-fix-script-paths: test "/usr/lib/util-vserver" = "$(pkglibdir)" || \ @@ -221,6 +225,7 @@ _install-vshelperlink: _install-vserverdir: $(mkinstalldirs) $(DESTDIR)$(vserverdir) $(DESTDIR)$(vserverpkgdir) + .fixups: config.status util-vserver.spec chmod a-w util-vserver.spec touch $@ @@ -229,6 +234,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 @@ -249,5 +257,7 @@ include $(top_srcdir)/m4/gpgsig.am include $(top_srcdir)/m4/validate.am include $(top_srcdir)/m4/changelog.am include $(top_srcdir)/m4/pkgconfig.am +include $(top_srcdir)/m4/libsel.am +include $(top_srcdir)/m4/install-notify.am .PHONY: FORCE update-doc