X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=5a20d151f838ed2bc9637d40720661e7f471173b;hb=7f5f268c2508135de7b8c9342baeda353bf5f945;hp=83cef0e282dda0d31cba5e0eb303ddfb21570b5d;hpb=655a5267664a2c960b838679261ab8101128bdc7;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 83cef0e..5a20d15 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -53,7 +53,8 @@ sysconf_DATA = DIETPROGS = $(ENSC_VECTOR_LIBS) -BUILT_SOURCES = linuxcaps.h pathconfig.h linuxvirtual.h +BUILT_SOURCES = linuxcaps.h pathconfig.h linuxvirtual.h \ + .fixups man_MANS = @@ -79,11 +80,12 @@ TESTS = TESTS_ENVIRONMENT = -AM_CPPFLAGS = -I $(top_srcdir)/lib -I $(top_srcdir)/ensc_wrappers -D _GNU_SOURCE $(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 + linuxcaps.h pathconfig.h .fixups DISTCLEANFILES = FEATURES.txt @@ -111,6 +113,15 @@ endif VSERVER_LDADDS = lib/libvserver.la $(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 $@ @@ -151,16 +162,22 @@ pathsubst_RULES = s!@'PKGLIBDIR'@!$(pkglibdir)!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!@'UMOUNT'@!$(UMOUNT)!g; \ + s!@'NAMEIF'@!$(NAMEIF)!g; \ s!@'NICE'@!$(NICE)!g; \ - s!@'VCONFIG'@!$(VCONFIG)!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!@'TAR'@!$(TAR)!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; \ @@ -217,6 +234,10 @@ _install-vshelperlink: _install-vserverdir: $(mkinstalldirs) $(DESTDIR)$(vserverdir) $(DESTDIR)$(vserverpkgdir) +.fixups: config.status util-vserver.spec + chmod a-w util-vserver.spec + touch $@ + if USE_DIETLIBC $(addsuffix $(EXEEXT), $(DIETPROGS)) \ $(addsuffix $(OBJEXT), $(DIETPROGS)) \ @@ -237,9 +258,13 @@ include $(top_srcdir)/sysv/Makefile-files include $(top_srcdir)/contrib/Makefile-files include $(top_srcdir)/ensc_vector/Makefile-files include $(top_srcdir)/ensc_wrappers/Makefile-files +include $(top_srcdir)/ensc_fmt/Makefile-files include $(top_srcdir)/lib_internal/Makefile-files +include $(top_srcdir)/vserver-start/Makefile-files include $(top_srcdir)/m4/gpgsig.am include $(top_srcdir)/m4/validate.am include $(top_srcdir)/m4/changelog.am include $(top_srcdir)/m4/pkgconfig.am + +.PHONY: FORCE