X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=5a3d4f42adb13ba2071b6627b03ec497c96845b9;hb=8f2fdb670dbb327fb197d36ec17828c7ae35471e;hp=2ce38dfee63c4f1849bcc5e51eb8aba28c4b7a73;hpb=21e1688569ebcdb48f6d8653139fa548cde2b219;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 2ce38df..5a3d4f4 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -53,12 +53,13 @@ sysconf_DATA = DIETPROGS = $(LIBENSCVECTOR_DIET) -BUILT_SOURCES = pathconfig.h linuxvirtual.h \ +BUILT_SOURCES = pathconfig.h \ .fixups man_MANS = -kernel_HDRS = kernel/context.h \ +kernel_HDRS = \ + kernel/context.h \ kernel/context_cmd.h \ kernel/cvirt.h \ kernel/cvirt_cmd.h \ @@ -67,6 +68,7 @@ kernel_HDRS = kernel/context.h \ kernel/debug_cmd.h \ kernel/dlimit.h \ kernel/dlimit_cmd.h \ + kernel/global.h \ kernel/inode.h \ kernel/inode_cmd.h \ kernel/legacy.h \ @@ -80,11 +82,13 @@ kernel_HDRS = kernel/context.h \ kernel/sched.h \ kernel/sched_cmd.h \ kernel/sched_def.h \ + kernel/signal.h \ kernel/signal_cmd.h \ kernel/switch.h \ kernel/xid.h + EXTRA_PROGRAMS = EXTRA_DIST = pathconfig.h.pathsubst \ util-vserver.spec \ @@ -127,23 +131,16 @@ endif 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 || : ) - - -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; \