minor optimizations
[util-vserver.git] / util-vserver / Makefile.am
index 2adbf36..5a20d15 100644 (file)
@@ -1,6 +1,6 @@
 ## $Id$
 
-# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+# Copyright (C) 2003,2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 #  
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,66 +26,107 @@ CVS2CL_ALLFLAGS        :=  $(CVS2CL_AMFLAGS) $(CVS2CL_FLAGS)
 confdir                        =  $(sysconfdir)/vservers
 confdefaultsdir                =  $(confdir)/.defaults
 sbincfgdir             =  $(sbindir)
+legacydir              =  $(pkglibdir)/legacy
 
-include_HEADERS                =  $(lib_HDRS)
-noinst_HEADERS         =  $(src_HDRS) $(lib_XHDRS) compat.h
+include_HEADERS =
+noinst_HEADERS =       $(ENSC_VECTOR_HDRS) \
+                       compat.h compat-c99.h
 
-lib_LIBRARIES          =  $(lib_lib_LIBS)
-#lib_LTLIBRARIES               =  $(lib_lib_LTLIBS)
+noinst_LIBRARIES =     $(ENSC_VECTOR_LIBS)
+lib_LIBRARIES =
+lib_LTLIBRARIES =
+pkglib_LTLIBRARIES =
 
-pkglib_SCRIPTS         =  $(scripts_pkglib_SCRPTS)
-pkglib_DATA            =  $(scripts_pkglib_DTA)
-pkglib_PROGRAMS                =  $(src_pkglib_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)
-sbin_PROGRAMS          =  $(src_sbin_PRGS)
-noinst_PROGRAMS                =  $(test_PRGS)
+initrd_SCRIPTS =
+sysconf_DATA =
 
-initrd_SCRIPTS         =  $(sysv_SCRPTS)
-sysconf_DATA           =  $(sysv_CFG)
+DIETPROGS =            $(ENSC_VECTOR_LIBS)
 
-DIETPROGS              =  $(src_DIETPROGS) $(tests_DIETPROGS)
+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) \
-                          pathconfig.h.pathsubst \
-                          util-vserver.spec \
-                          THANKS
+EXTRA_PROGRAMS =
+EXTRA_DIST =           pathconfig.h.pathsubst \
+                       util-vserver.spec \
+                       THANKS \
+                       $(kernel_HDRS)
 
-check_PROGRAMS         =  $(src_check_PRGS)
-check_SCRIPTS          =  $(src_check_SCRPTS)
-TESTS                  =  $(src_TSTS)
+check_PROGRAMS =
+check_SCRIPTS =
+TESTS =
 
-TESTS_ENVIRONMENT      =  $(src_TESTS_ENV)
+TESTS_ENVIRONMENT =
 
-AM_CPPFLAGS            =  -I $(top_srcdir)/lib -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) \
-                          .*.pathsubst.stamp */.*.pathsubst.stamp \
-                          linuxcaps.h pathconfig.h
+CLEANFILES =           $(BUILT_SOURCES) \
+                       .*.pathsubst.stamp */.*.pathsubst.stamp */*/.*.pathsubst.stamp \
+                       linuxcaps.h pathconfig.h .fixups
 
-AM_INSTALLCHECK_STD_OPTIONS_EXEMPT     =  $(src_OPTIONS_EXEMPT) \
-                                          $(scripts_OPTIONS_EXEMPT) \
-                                          $(sysv_OPTIONS_EXEMPT)
+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
+else
+VSERVER_LDFLAGS               :=
 endif
 
+if USE_DIETLIBC_COMPAT
+DIET_COMPAT_LDADDS =   -lcompat
+else
+DIET_COMPAT_LDADDS =
+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 <stdint.h>' >$@.tmp
-                       sed -e 's!^#include .*!!g;s!\<__u32\>!uint32_t!g;s!\<__user\>!!g;' $< >>$@.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 $@
@@ -99,37 +140,54 @@ else
                        ln -sf '$(top_srcdir)/lib/virtual.h' '$@'
 endif
 
-pathsubst_RULES                =  s!@'PKGLIBDIR'@!$(pkglibdir)!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!@'INCLUDEDIR'@!$(includedir)!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!@'WC'@!$(WC)!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
                        @mkdir -p $$(dirname '$@')
-                       @echo "sed -e '...' $*.pathsubst >$*"
-                       @sed -e '$(pathsubst_RULES)' '$<' >'$@.tmp'
+                       @echo "$(SED) -e '...' $*.pathsubst >$*"
+                       @$(SED) -e '$(pathsubst_RULES)' '$<' >'$@.tmp'
                        @-chmod --reference='$<' '$@.tmp'
                        @if cmp -s '$@.tmp' '$*'; then \
                                echo "... no changes, reusing old version"; \
@@ -140,21 +198,50 @@ 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
 
-install-data-hook:
-                       $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgstatedir) $(DESTDIR)$(pkgstaterevdir)
-                       $(mkinstalldirs) -m 755 $(DESTDIR)$(confdefaultsdir)/{apps/pkgmgmt,files}
-                       f=$(DESTDIR)$(confdefaultsdir)/vdirbase; test -e "$$f" || ln -s '$(vserverdir)'     "$$f"
-                       f=$(DESTDIR)$(confdefaultsdir)/run.rev;  test -e "$$f" || ln -s '$(pkgstaterevdir)' "$$f"
+fix_SCRPTS             =  $(addprefix $(pkglibdir)/, $(notdir $(pkglib_SCRIPTS))) \
+                          $(addprefix $(legacydir)/, $(notdir $(legacy_SCRIPTS))) \
+                          $(addprefix $(sbindir)/,   $(notdir $(sbin_SCRIPTS))) \
+                          $(addprefix $(initrddir)/, $(notdir $(initrd_SCRIPTS)))
 
-install-vserverdir:
+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)$(confdefaultsdir)
+                       f=$(DESTDIR)$(confdefaultsdir)/vdirbase; test -e "$$f" || ln -sf '$(vserverdir)'     "$$f"
+                       f=$(DESTDIR)$(confdefaultsdir)/run.rev;  test -e "$$f" || ln -sf '$(pkgstaterevdir)' "$$f"
+
+install-fix-script-paths:
+                       test "/usr/lib/util-vserver" = "$(pkglibdir)" || \
+                       for i in $(fix_SCRPTS); do \
+                               f="$(DESTDIR)$$i"; \
+                               $(SED) -e 's!/usr/lib/util-vserver!$(pkglibdir)!g' "$$f" >"$$f.tmp"; \
+                               $(CMP) -s "$$f.tmp" "$$f" || cat "$$f.tmp" >"$$f"; \
+                               rm -f "$$f.tmp"; \
+                       done
+
+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
-$(DIETPROGS):          LIBTOOL=$(LIBTOOL) --tag CC
+$(addsuffix $(EXEEXT), $(DIETPROGS)) \
+$(addsuffix $(OBJEXT), $(DIETPROGS)) \
+               :               LIBTOOL=$(DIET_LIBTOOL)
 
 $(addsuffix $(EXEEXT), $(DIETPROGS)) \
 $(addsuffix $(OBJEXT), $(DIETPROGS)) \
@@ -168,8 +255,16 @@ include $(top_srcdir)/man/Makefile-files
 include $(top_srcdir)/scripts/Makefile-files
 include $(top_srcdir)/tests/Makefile-files
 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