minor optimizations
[util-vserver.git] / util-vserver / Makefile.am
index a9e628c..5a20d15 100644 (file)
@@ -28,73 +28,69 @@ confdefaultsdir             =  $(confdir)/.defaults
 sbincfgdir             =  $(sbindir)
 legacydir              =  $(pkglibdir)/legacy
 
-include_HEADERS =      $(lib_HDRS)
-noinst_HEADERS =       $(src_HDRS) $(lib_XHDRS) \
-                       $(lib_internal_libinternal_a_XHDRS) \
-                       $(ENSC_VECTOR_HDRS) $(ENSC_VECTOR_XHDRS) \
-                       $(ENSC_WRAPPERS_HDRS) \
+include_HEADERS =
+noinst_HEADERS =       $(ENSC_VECTOR_HDRS) \
                        compat.h compat-c99.h
 
-noinst_LIBRARIES       =  $(src_lib_LIBS) $(ENSC_VECTOR_LIBS) $(lib_internal_LIBS)
-lib_LIBRARIES          =  $(lib_lib_LIBS)
-lib_LTLIBRARIES                =  $(lib_lib_LTLIBS) $(src_lib_LTLIBS)
-pkglib_LTLIBRARIES     =  $(src_pkglib_LTLIBS)
+noinst_LIBRARIES =     $(ENSC_VECTOR_LIBS)
+lib_LIBRARIES =
+lib_LTLIBRARIES =
+pkglib_LTLIBRARIES =
 
-pkglib_SCRIPTS         =  $(scripts_pkglib_SCRPTS)
-pkglib_DATA            =  $(scripts_pkglib_DTA) \
-                          FEATURES.txt
-pkglib_PROGRAMS =      $(src_pkglib_PRGS)
-legacy_SCRIPTS =       $(scripts_legacy_SCRPTS) $(src_legacy_SCRPTS)
-legacy_PROGRAMS =      $(src_legacy_PRGS)
+pkglib_SCRIPTS =
+pkglib_DATA =          FEATURES.txt
+pkglib_PROGRAMS =
+legacy_SCRIPTS =
+legacy_PROGRAMS =
 
-sbincfg_DATA           =  $(scripts_sbincfg_DTA)
+sbin_SCRIPTS =
+sbin_PROGRAMS =
+noinst_PROGRAMS =
+noinst_DATA =
 
-sbin_SCRIPTS           =  $(scripts_sbin_PRGS) $(src_sbin_SCRPTS)
-sbin_PROGRAMS          =  $(src_sbin_PRGS)
-noinst_PROGRAMS                =  $(test_PRGS)
-noinst_DATA            =  $(contrib_DTA) $(doc_DAT)
+initrd_SCRIPTS =
+sysconf_DATA =
 
-initrd_SCRIPTS         =  $(sysv_SCRPTS)
-sysconf_DATA           =  $(sysv_CFG)
+DIETPROGS =            $(ENSC_VECTOR_LIBS)
 
-DIETPROGS =            $(src_DIETPROGS) $(tests_DIETPROGS) $(lib_DIETPROGS) \
-                       $(lib_internal_DIETPROGS)
-                       $(ENSC_VECTOR_LIBS)
+BUILT_SOURCES =                linuxcaps.h pathconfig.h linuxvirtual.h \
+                       .fixups
 
-BUILT_SOURCES =                linuxcaps.h pathconfig.h linuxvirtual.h
+man_MANS =
 
-man_MANS =             $(man_DATMAN)
+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 =       $(src_EXTRA_PROGS)
-EXTRA_DIST =           $(sysv_XTRAS) $(sysv_CFG) \
-                        $(doc_DAT) $(man_DATMAN) \
-                       $(scripts_XTRAS) $(src_XTRAS) \
-                       $(contrib_XTRAS) \
-                       pathconfig.h.pathsubst \
+EXTRA_PROGRAMS =
+EXTRA_DIST =           pathconfig.h.pathsubst \
                        util-vserver.spec \
-                       THANKS
+                       THANKS \
+                       $(kernel_HDRS)
 
-check_PROGRAMS =       $(src_check_PRGS) $(lib_testsuite_PRGS) \
-                       $(ENSC_VECTOR_TESTSUITE_PRGS)
-check_SCRIPTS =                $(src_check_SCRPTS)
-TESTS =                        $(src_TSTS) $(lib_testsuite_TSTS) \
-                       $(ENSC_VECTOR_TESTSUITE_TSTS)
+check_PROGRAMS =
+check_SCRIPTS =
+TESTS =
 
-TESTS_ENVIRONMENT      =  $(src_TESTS_ENV)
+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 =           $(sysv_GENSCRPTS) $(scripts_CLEANFILES) $(BUILT_SOURCES) \
-                       $(contrib_CLEANFILES) \
+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     =  $(src_OPTIONS_EXEMPT) \
-                                          $(scripts_OPTIONS_EXEMPT) \
-                                          $(sysv_OPTIONS_EXEMPT)
+AM_INSTALLCHECK_STD_OPTIONS_EXEMPT =
 
 LIBTOOL_CC =           @LIBTOOL@ --tag CC
 LIBTOOL_CXX =          @LIBTOOL@ --tag CXX
@@ -117,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 $@
@@ -135,40 +140,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
@@ -185,19 +198,21 @@ 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))) \
-                          $(addprefix $(sbindir)/,   $(notdir $(sbin_SCRIPTS)))
+                          $(addprefix $(sbindir)/,   $(notdir $(sbin_SCRIPTS))) \
+                          $(addprefix $(initrddir)/, $(notdir $(initrd_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"
 
@@ -210,9 +225,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)) \
@@ -233,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