added Vector_zeroEnd() function
[util-vserver.git] / util-vserver / Makefile.am
index 9ad9487..f2d1742 100644 (file)
@@ -53,14 +53,26 @@ 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/inode.h \
+                       kernel/legacy.h \
+                       kernel/limit.h \
+                       kernel/namespace.h \
+                       kernel/network.h \
+                       kernel/sched.h \
+                       kernel/signal.h \
+                       kernel/switch.h
+
 EXTRA_PROGRAMS =
 EXTRA_DIST =           pathconfig.h.pathsubst \
                        util-vserver.spec \
-                       THANKS
+                       THANKS \
+                       $(kernel_HDRS)
 
 check_PROGRAMS =
 check_SCRIPTS =
@@ -72,7 +84,7 @@ AM_CPPFLAGS           =  -I $(top_srcdir)/lib -I $(top_srcdir)/ensc_wrappers -D _GNU_SOUR
 
 CLEANFILES =           $(BUILT_SOURCES) \
                        .*.pathsubst.stamp */.*.pathsubst.stamp */*/.*.pathsubst.stamp \
-                       linuxcaps.h pathconfig.h
+                       linuxcaps.h pathconfig.h .fixups
 
 DISTCLEANFILES =       FEATURES.txt
 
@@ -118,40 +130,48 @@ else
                        ln -sf '$(top_srcdir)/lib/virtual.h' '$@'
 endif
 
-pathsubst_RULES                =  s!@'PKGLIBDIR'@!$(pkglibdir)!g; \
-                          s!@'LEGACYDIR'@!$(legacydir)!g; \
-                          s!@'SBINDIR'@!$(sbindir)!g; \
-                          s!@'CONFDIR'@!$(confdir)!g; \
-                          s!@'SYSCONFDIR'@!$(sysconfdir)!g; \
-                          s!@'PKGSTATEDIR'@!$(pkgstatedir)!g; \
-                          s!@'PKGSTATEREVDIR'@!$(pkgstaterevdir)!g; \
-                          s!@'VSERVERDIR'@!$(vserverdir)!g; \
-                          s!@'VSERVERPKGDIR'@!$(vserverpkgdir)!g; \
-                          s!@'VSERVERPKGDIR'@!$(vserverpkgdir)!g; \
-                          s!@'INITRDDIR'@!$(initrddir)!g; \
-                          s!@'LIBDIR'@!$(libdir)!g; \
-                          s!@'MANDIR'@!$(mandir)!g; \
-                          s!@'INCLUDEDIR'@!$(includedir)!g; \
-                          s!@'PACKAGE'@!$(PACKAGE)!g; \
-                          s!@'PACKAGE_BUGREPORT'@!$(PACKAGE_BUGREPORT)!g; \
-                          s!@'PACKAGE_NAME'@!$(PACKAGE_NAME)!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!@'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;
+pathsubst_RULES =      s!@'PKGLIBDIR'@!$(pkglibdir)!g; \
+                       s!@'LEGACYDIR'@!$(legacydir)!g; \
+                       s!@'SBINDIR'@!$(sbindir)!g; \
+                       s!@'CONFDIR'@!$(confdir)!g; \
+                       s!@'SYSCONFDIR'@!$(sysconfdir)!g; \
+                       s!@'PKGSTATEDIR'@!$(pkgstatedir)!g; \
+                       s!@'PKGSTATEREVDIR'@!$(pkgstaterevdir)!g; \
+                       s!@'VSERVERDIR'@!$(vserverdir)!g; \
+                       s!@'VSERVERPKGDIR'@!$(vserverpkgdir)!g; \
+                       s!@'VSERVERPKGDIR'@!$(vserverpkgdir)!g; \
+                       s!@'VSHELPERSTATEDIR'@!$(vshelperstatedir)!g; \
+                       s!@'INITRDDIR'@!$(initrddir)!g; \
+                       s!@'LIBDIR'@!$(libdir)!g; \
+                       s!@'MANDIR'@!$(mandir)!g; \
+                       s!@'INCLUDEDIR'@!$(includedir)!g; \
+                       s!@'PACKAGE'@!$(PACKAGE)!g; \
+                       s!@'PACKAGE_BUGREPORT'@!$(PACKAGE_BUGREPORT)!g; \
+                       s!@'PACKAGE_NAME'@!$(PACKAGE_NAME)!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;
 
 pathconfig.h:          .pathconfig.h.pathsubst.stamp
 .%.pathsubst.stamp:    %.pathsubst Makefile
@@ -168,9 +188,10 @@ pathconfig.h:              .pathconfig.h.pathsubst.stamp
                        @chmod a-w '$*'
                        @touch '$@'
 
-pkgstatedir            =  $(localstatedir)/run/vservers
-pkgstaterevdir         =  $(pkgstatedir).rev
-vserverpkgdir          =  $(vserverdir)/.pkg
+pkgstatedir =          $(localstatedir)/run/vservers
+pkgstaterevdir =       $(pkgstatedir).rev
+vserverpkgdir =                $(vserverdir)/.pkg
+vshelperstatedir =     $(localstatedir)/run/vshelper
 
 fix_SCRPTS             =  $(addprefix $(pkglibdir)/, $(notdir $(pkglib_SCRIPTS))) \
                           $(addprefix $(legacydir)/, $(notdir $(legacy_SCRIPTS))) \
@@ -180,8 +201,8 @@ fix_SCRPTS          =  $(addprefix $(pkglibdir)/, $(notdir $(pkglib_SCRIPTS))) \
 install-data-hook:     install-fix-script-paths install-create-dirs
 
 install-create-dirs:
-                       $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgstatedir) $(DESTDIR)$(pkgstaterevdir)
-                       $(mkinstalldirs) -m 755 $(DESTDIR)$(confdefaultsdir)/{apps/pkgmgmt,files}
+                       $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgstatedir) $(DESTDIR)$(pkgstaterevdir) $(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"
 
@@ -194,9 +215,19 @@ install-fix-script-paths:
                                rm -f "$$f.tmp"; \
                        done
 
-install-vserverdir:
+install-distribution:  _install-vserverdir _install-vshelperlink
+
+_install-vshelperlink:
+                       $(mkinstalldirs) $(DESTDIR)/sbin
+                       ln -sf ..$(pkglibdir)/vshelper $(DESTDIR)/sbin/vshelper
+
+_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)) \