X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=5feb05bff01e0a6e34d131131be67461c52f9312;hb=dd0c1a718164f9802199d699337411f2ccb41921;hp=12dc5dfcd4aeef3e391b019b35adbbfead284a57;hpb=bcade54a36a64a24cd9113598f38d08f0451fb67;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 12dc5df..5feb05b 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -53,12 +53,15 @@ sysconf_DATA = DIETPROGS = $(ENSC_VECTOR_LIBS) -BUILT_SOURCES = linuxcaps.h pathconfig.h linuxvirtual.h \ +BUILT_SOURCES = 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 \ @@ -66,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 \ @@ -85,7 +89,7 @@ AM_CPPFLAGS = -I $(top_srcdir)/lib -I $(top_srcdir)/ensc_wrappers \ CLEANFILES = $(BUILT_SOURCES) \ .*.pathsubst.stamp */.*.pathsubst.stamp */*/.*.pathsubst.stamp \ - linuxcaps.h pathconfig.h .fixups + pathconfig.h .fixups DISTCLEANFILES = FEATURES.txt @@ -119,14 +123,6 @@ silent.%: FORCE 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 - @-chmod --reference $< $@.tmp &>/dev/null - mv -f $@.tmp $@ - @chmod a-w $@ - linuxvirtual.h: if ENSC_ENABLE_INTERNAL_HEADERS @@ -157,27 +153,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!@'ENV'@!$(ENV)!g; \ - s!@'GREP'@!$(GREP)!g; \ - s!@'IP'@!$(IP)!g; \ - s!@'IPTABLES'@!$(IPTABLES)!g; \ - s!@'MODPROBE'@!$(MODPROBE)!g; \ - s!@'MOUNT'@!$(MOUNT)!g; \ - s!@'NAMEIF'@!$(NAMEIF)!g; \ - s!@'NICE'@!$(NICE)!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!@'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; \ - 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 @@ -195,7 +175,7 @@ pathconfig.h: .pathconfig.h.pathsubst.stamp @touch '$@' pkgstatedir = $(localstatedir)/run/vservers -pkgstaterevdir = $(pkgstatedir).rev +pkgstaterevdir = $(confdefaultsdir)/run.rev vserverpkgdir = $(vserverdir)/.pkg vshelperstatedir = $(localstatedir)/run/vshelper @@ -204,13 +184,16 @@ 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: - $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgstatedir) $(DESTDIR)$(pkgstaterevdir) $(DESTDIR)$(vshelperstatedir) + $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgstatedir) $(DESTDIR)$(pkgstatedir).rev $(DESTDIR)$(vshelperstatedir) $(mkinstalldirs) -m 755 $(DESTDIR)$(confdefaultsdir) - f=$(DESTDIR)$(confdefaultsdir)/vdirbase; test -e "$$f" || ln -sf '$(vserverdir)' "$$f" - f=$(DESTDIR)$(confdefaultsdir)/run.rev; test -e "$$f" || ln -sf '$(pkgstaterevdir)' "$$f" + f=$(DESTDIR)$(confdefaultsdir)/vdirbase; test -e "$$f" || ln -sf '$(vserverdir)' "$$f" + f=$(DESTDIR)$(pkgstaterevdir); test -e "$$f" || ln -sf '$(pkgstatedir).rev' "$$f" install-fix-script-paths: test "/usr/lib/util-vserver" = "$(pkglibdir)" || \ @@ -259,4 +242,4 @@ include $(top_srcdir)/m4/validate.am include $(top_srcdir)/m4/changelog.am include $(top_srcdir)/m4/pkgconfig.am -.PHONY: FORCE +.PHONY: FORCE update-doc