X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=9de448acd9e2a4c87d960d88f19d6004ba3629fe;hb=8ec153081f460da369f74876b42758a7a18b617c;hp=333e0faaeefde507e2f4b0ce80ee1d23d72a2064;hpb=c0644c75851b7101e0ad6128df0ac683aff346ef;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 333e0fa..9de448a 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 @@ -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 \ @@ -74,16 +75,18 @@ kernel_HDRS = kernel/context.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.h \ + kernel/signal_cmd.h \ kernel/switch.h \ kernel/xid.h + EXTRA_PROGRAMS = EXTRA_DIST = pathconfig.h.pathsubst \ util-vserver.spec \ @@ -126,23 +129,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; \ @@ -225,6 +221,7 @@ _install-vshelperlink: _install-vserverdir: $(mkinstalldirs) $(DESTDIR)$(vserverdir) $(DESTDIR)$(vserverpkgdir) + .fixups: config.status util-vserver.spec chmod a-w util-vserver.spec touch $@ @@ -257,5 +254,6 @@ 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