X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=5f0b6e25f235e2f90bb29992d2e98596a8c2aad7;hb=3eb1b2279739d0f16391a3724a9897c686f030d3;hp=17ff7bb3d180ac1456db89b73cf24fb3829393b1;hpb=9bf2c8e42990264a62c91f1fe26a4353a389bb4b;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 17ff7bb..5f0b6e2 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -1,6 +1,6 @@ ## $Id$ -# Copyright (C) 2003 Enrico Scholz +# Copyright (C) 2003,2004 Enrico Scholz # # 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 @@ -28,74 +28,102 @@ 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) $(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) -pkglib_PROGRAMS = $(src_pkglib_PRGS) -legacy_SCRIPTS = $(scripts_legacy_SCRPTS) +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 = $(LIBENSCVECTOR_DIET) -DIETPROGS = $(src_DIETPROGS) $(tests_DIETPROGS) $(lib_DIETPROGS) +BUILT_SOURCES = 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/cvirt.h \ + kernel/debug.h \ + kernel/dlimit.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 \ + kernel/xid.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_ENVIRONMENT = $(src_TESTS_ENV) +TESTS_DEBUG = no +TESTS = +TESTS_ENVIRONMENT = ensc_use_expensive_tests="$(ENSC_USE_EXPENSIVE_TESTS)" \ + ensc_test_debug="$(TESTS_DEBUG)" -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 \ + 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 = if USE_DIETLIBC DIET = diet DIET_FLAGS = DIET_CC := $(DIET) $(DIET_FLAGS) $(CC) -DIET_LIBTOOL := $(LIBTOOL) --tag CC -VSERVER_LDFLAGS := -static +VSERVER_LDFLGS := -static +else +VSERVER_LDFLGS := +endif + +if USE_DIETLIBC_COMPAT +DIET_COMPAT_LDADDS = -lcompat else -VSERVER_LDFLAGS := +DIET_COMPAT_LDADDS = endif -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 $@ +VSERVER_LDADDS = $(LIBVSERVER) $(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 || : ) linuxvirtual.h: @@ -106,37 +134,38 @@ 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!@'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; \ + $(ENSC_PATHPROG_SED) 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"; \ @@ -147,27 +176,56 @@ 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 = $(confdefaultsdir)/run.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 $(initrddir)/, $(notdir $(initrd_SCRIPTS))) + +update-doc: doc + $(top_srcdir)/update-doc + +install-data-hook: install-fix-script-paths install-create-dirs -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" +install-create-dirs: + $(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)$(pkgstaterevdir); test -e "$$f" || ln -sf '$(pkgstatedir).rev' "$$f" -install-vserverdir: +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) -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) +else !USE_DIETLIBC +nodist_lib_dietlibc_not_enabled_error_a_SOURCES = \ + lib-dietlibc-not-enabled-error.c endif include $(top_srcdir)/lib/Makefile-files @@ -177,8 +235,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 update-doc