X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=2d4dc3374b86d9c53cc1f01c16c72c12e780bda4;hb=4fc0d7c31dd9fb6bae2e77ba37d8a08ab26dd65c;hp=dbaf0b282bd99b929e65939d48296f38a9bfd64e;hpb=e5099a4be56aed76b5b8e537ccffad6f79c0bd86;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index dbaf0b2..2d4dc33 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 @@ -20,49 +20,63 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = . distrib -CVS2CL_AMFLAGS = $(CVS2CL_TAG) -U cvsusers.map +CVS2CL_AMFLAGS = $(CVS2CL_TAG) -U cvsusers.map --show-dead 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 +noinst_HEADERS = $(src_HDRS) $(lib_XHDRS) compat.h compat-c99.h lib_LIBRARIES = $(lib_lib_LIBS) -#lib_LTLIBRARIES = $(lib_lib_LTLIBS) +lib_LTLIBRARIES = $(lib_lib_LTLIBS) $(src_lib_LTLIBS) +pkglib_LTLIBRARIES = $(src_pkglib_LTLIBS) -pkglib_SCRIPTS = $(scripts_SCRPTS) -pkglib_DATA = $(scriptscfg_DATA) $(scripts_DTA) +pkglib_SCRIPTS = $(scripts_pkglib_SCRPTS) +pkglib_DATA = $(scripts_pkglib_DTA) pkglib_PROGRAMS = $(src_pkglib_PRGS) +legacy_SCRIPTS = $(scripts_legacy_SCRPTS) -sbin_SCRIPTS = $(scripts_PRGS) +sbincfg_DATA = $(scripts_sbincfg_DTA) + +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 = $(sysv_SCRPTS) sysconf_DATA = $(sysv_CFG) -DIETPROGS = $(src_DIETPROGS) $(tests_DIETPROGS) +DIETPROGS = $(src_DIETPROGS) $(tests_DIETPROGS) $(lib_DIETPROGS) BUILT_SOURCES = linuxcaps.h pathconfig.h linuxvirtual.h man_MANS = $(man_DATMAN) -EXTRA_PROGRAMS = $(src_EXTRA_PROGS) -EXTRA_DIST = $(sysv_XTRAS) $(sysv_CFG) \ - $(doc_DAT) $(man_DATMAN) \ - $(scripts_SCRPTS) $(scripts_PRGS) $(scripts_XTRAS) \ - pathconfig.h.pathsubst \ - util-vserver.spec \ - m4/ensc_cflags.m4 m4/ensc_fpicsyscall.m4 \ - m4/ensc_cxxcompiler.m4 \ - THANKS +EXTRA_PROGRAMS = $(src_EXTRA_PROGS) +EXTRA_DIST = $(sysv_XTRAS) $(sysv_CFG) \ + $(doc_DAT) $(man_DATMAN) \ + $(scripts_XTRAS) $(src_XTRAS) \ + $(contrib_XTRAS) \ + pathconfig.h.pathsubst \ + util-vserver.spec \ + THANKS + +check_PROGRAMS = $(src_check_PRGS) +check_SCRIPTS = $(src_check_SCRPTS) +TESTS = $(src_TSTS) + +TESTS_ENVIRONMENT = $(src_TESTS_ENV) AM_CPPFLAGS = -I $(top_srcdir)/lib -D _GNU_SOURCE $(RELEASE_CPPFLAGS) -CLEANFILES = $(sysv_GENSCRPTS) $(scripts_GENSCRPTS) $(BUILT_SOURCES) \ - .*.pathsubst.stamp */.*.pathsubst.stamp \ - linuxcaps.h pathconfig.h +CLEANFILES = $(sysv_GENSCRPTS) $(scripts_CLEANFILES) $(BUILT_SOURCES) \ + $(contrib_CLEANFILES) \ + .*.pathsubst.stamp */.*.pathsubst.stamp */*/.*.pathsubst.stamp \ + linuxcaps.h pathconfig.h AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = $(src_OPTIONS_EXEMPT) \ $(scripts_OPTIONS_EXEMPT) \ @@ -72,26 +86,44 @@ if USE_DIETLIBC DIET = diet DIET_FLAGS = DIET_CC := $(DIET) $(DIET_FLAGS) $(CC) +DIET_LIBTOOL := $(LIBTOOL) --tag CC +VSERVER_LDFLAGS := -static +else +VSERVER_LDFLAGS := endif -linuxcaps.h: - ln -sf ${kernelincludedir}/linux/capability.h linuxcaps.h +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 + ln -sf '$(top_srcdir)/lib/virtual.h' '$@' +else ln -sf '$(kernelincludedir)/linux/virtual.h' '$@' && test -e '$@' || \ 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; \ @@ -104,13 +136,16 @@ pathsubst_RULES = s!@'PKGLIBDIR'@!$(pkglibdir)!g; \ s!@'UMOUNT'@!$(UMOUNT)!g; \ s!@'NICE'@!$(NICE)!g; \ s!@'VCONFIG'@!$(VCONFIG)!g; \ - s!@'WC'@!$(WC)!g + s!@'PS'@!$(PS)!g; \ + s!@'WC'@!$(WC)!g; \ + s!@'WGET'@!$(WGET)!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"; \ rm -f '$@.tmp'; \ @@ -121,14 +156,37 @@ pathconfig.h: .pathconfig.h.pathsubst.stamp @touch '$@' pkgstatedir = $(localstatedir)/run/vservers +pkgstaterevdir = $(pkgstatedir).rev vserverpkgdir = $(vserverdir)/.pkg -install-data-hook: - $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgstatedir)/rev +fix_SCRPTS = $(addprefix $(pkglibdir)/, $(notdir $(pkglib_SCRIPTS))) \ + $(addprefix $(legacydir)/, $(notdir $(legacy_SCRIPTS))) \ + $(addprefix $(sbindir)/, $(notdir $(sbin_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} + 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-vserverdir: $(mkinstalldirs) $(DESTDIR)$(vserverdir) $(DESTDIR)$(vserverpkgdir) if USE_DIETLIBC -$(DIETPROGS): LIBTOOL=$(LIBTOOL) --tag CC +$(addsuffix $(EXEEXT), $(DIETPROGS)) \ +$(addsuffix $(OBJEXT), $(DIETPROGS)) \ + : LIBTOOL=$(DIET_LIBTOOL) $(addsuffix $(EXEEXT), $(DIETPROGS)) \ $(addsuffix $(OBJEXT), $(DIETPROGS)) \ @@ -142,6 +200,7 @@ 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)/m4/gpgsig.am include $(top_srcdir)/m4/validate.am