X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=949f41adcf589267026661c24a615929293ebc98;hb=86a9657f40f1266ae61e021dc8bcadad55aa7301;hp=83cef0e282dda0d31cba5e0eb303ddfb21570b5d;hpb=655a5267664a2c960b838679261ab8101128bdc7;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 83cef0e..949f41a 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -53,11 +53,15 @@ 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 = kernel_HDRS = kernel/context.h \ + kernel/cvirt.h \ + kernel/debug.h \ + kernel/dlimit.h \ kernel/inode.h \ kernel/legacy.h \ kernel/limit.h \ @@ -65,7 +69,8 @@ kernel_HDRS = kernel/context.h \ kernel/network.h \ kernel/sched.h \ kernel/signal.h \ - kernel/switch.h + kernel/switch.h \ + kernel/xid.h EXTRA_PROGRAMS = EXTRA_DIST = pathconfig.h.pathsubst \ @@ -79,28 +84,25 @@ 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 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = -LIBTOOL_CC = @LIBTOOL@ --tag CC -LIBTOOL_CXX = @LIBTOOL@ --tag CXX - if USE_DIETLIBC DIET = diet DIET_FLAGS = DIET_CC := $(DIET) $(DIET_FLAGS) $(CC) -DIET_LIBTOOL := $(LIBTOOL_CC) -VSERVER_LDFLAGS := -static +VSERVER_LDFLGS := -static else -VSERVER_LDFLAGS := +VSERVER_LDFLGS := endif if USE_DIETLIBC_COMPAT @@ -111,11 +113,20 @@ 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 $@ echo '#include ' >$@.tmp - $(SED) -e 's!^#include .*!!g;s!\<__u32\>!uint32_t!g;s!\<__user\>!!g;' $< >>$@.tmp + $(SED) -e 's!^#include .*!!g;' $< >>$@.tmp @-chmod --reference $< $@.tmp &>/dev/null mv -f $@.tmp $@ @chmod a-w $@ @@ -150,21 +161,11 @@ pathsubst_RULES = s!@'PKGLIBDIR'@!$(pkglibdir)!g; \ s!@'PACKAGE_STRING'@!$(PACKAGE_STRING)!g; \ s!@'PACKAGE_TARNAME'@!$(PACKAGE_TARNAME)!g; \ s!@'PACKAGE_VERSION'@!$(PACKAGE_VERSION)!g; \ - s!@'AWK'@!$(AWK)!g; \ - s!@'GREP'@!$(GREP)!g; \ - s!@'IP'@!$(IP)!g; \ - s!@'MOUNT'@!$(MOUNT)!g; \ - s!@'UMOUNT'@!$(UMOUNT)!g; \ - s!@'NICE'@!$(NICE)!g; \ - s!@'VCONFIG'@!$(VCONFIG)!g; \ - s!@'PS'@!$(PS)!g; \ - s!@'WC'@!$(WC)!g; \ - s!@'WGET'@!$(WGET)!g; \ - s!@'TAR'@!$(TAR)!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; \ - s!@'ENSC_HAVE_CXX_COMPILER_FALSE'@!\@ENSC_HAVE_CXX_COMPILER_FALSE@ !g; + s!@'ENSC_HAVE_CXX_COMPILER_FALSE'@!\@ENSC_HAVE_CXX_COMPILER_FALSE@ !g; \ + $(ENSC_PATHPROG_SED) pathconfig.h: .pathconfig.h.pathsubst.stamp .%.pathsubst.stamp: %.pathsubst Makefile @@ -191,6 +192,9 @@ fix_SCRPTS = $(addprefix $(pkglibdir)/, $(notdir $(pkglib_SCRIPTS))) \ $(addprefix $(sbindir)/, $(notdir $(sbin_SCRIPTS))) \ $(addprefix $(initrddir)/, $(notdir $(initrd_SCRIPTS))) +update-doc: doc + $(top_srcdir)/update-doc + install-data-hook: install-fix-script-paths install-create-dirs install-create-dirs: @@ -217,11 +221,11 @@ _install-vshelperlink: _install-vserverdir: $(mkinstalldirs) $(DESTDIR)$(vserverdir) $(DESTDIR)$(vserverpkgdir) -if USE_DIETLIBC -$(addsuffix $(EXEEXT), $(DIETPROGS)) \ -$(addsuffix $(OBJEXT), $(DIETPROGS)) \ - : LIBTOOL=$(DIET_LIBTOOL) +.fixups: config.status util-vserver.spec + chmod a-w util-vserver.spec + touch $@ +if USE_DIETLIBC $(addsuffix $(EXEEXT), $(DIETPROGS)) \ $(addsuffix $(OBJEXT), $(DIETPROGS)) \ : CC=$(DIET_CC) @@ -237,9 +241,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 update-doc