X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=8adb41e1a72a67cd48a4a6e6d41fb0d59ff81cd1;hb=02d358546ec9b7c6e38cf415b9581e6523411d61;hp=28f763434a306d5cc07b75043c061848539238ff;hpb=cfd9c3c85ff502b9bcf69a33d110f84e0054c794;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 28f7634..8adb41e 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -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 @@ -53,25 +53,38 @@ sysconf_DATA = DIETPROGS = $(LIBENSCVECTOR_DIET) -BUILT_SOURCES = 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 \ @@ -114,23 +127,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; \ @@ -213,6 +219,7 @@ _install-vshelperlink: _install-vserverdir: $(mkinstalldirs) $(DESTDIR)$(vserverdir) $(DESTDIR)$(vserverpkgdir) + .fixups: config.status util-vserver.spec chmod a-w util-vserver.spec touch $@ @@ -244,5 +251,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