X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=2adbf36354f62ce185269173e52453713392f383;hb=4fbda6a580ea77c11a507c1c45f1bceed3653722;hp=9c085e89e1f646f844489739d927a49651ca112b;hpb=e2ba9eff3ab39d5fd07123d7d37969235ce857c4;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 9c085e8..2adbf36 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -20,83 +20,117 @@ 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) -sysvdir = $(sysconfdir)/init.d confdir = $(sysconfdir)/vservers +confdefaultsdir = $(confdir)/.defaults +sbincfgdir = $(sbindir) include_HEADERS = $(lib_HDRS) noinst_HEADERS = $(src_HDRS) $(lib_XHDRS) compat.h lib_LIBRARIES = $(lib_lib_LIBS) +#lib_LTLIBRARIES = $(lib_lib_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) -sbin_SCRIPTS = $(scripts_PRGS) +sbincfg_DATA = $(scripts_sbincfg_DTA) + +sbin_SCRIPTS = $(scripts_sbin_PRGS) sbin_PROGRAMS = $(src_sbin_PRGS) noinst_PROGRAMS = $(test_PRGS) -sysv_SCRIPTS = $(sysv_SCRPTS) +initrd_SCRIPTS = $(sysv_SCRPTS) sysconf_DATA = $(sysv_CFG) +DIETPROGS = $(src_DIETPROGS) $(tests_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) \ + $(scripts_XTRAS) $(src_XTRAS) \ pathconfig.h.pathsubst \ util-vserver.spec \ - m4/ensc_cflags.m4 \ THANKS -AM_CPPFLAGS = -I $(top_srcdir)/lib -D _GNU_SOURCE -AM_CFLAGS = -Wall -pedantic +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) \ +CLEANFILES = $(sysv_GENSCRPTS) $(scripts_CLEANFILES) $(BUILT_SOURCES) \ .*.pathsubst.stamp */.*.pathsubst.stamp \ linuxcaps.h pathconfig.h +AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = $(src_OPTIONS_EXEMPT) \ + $(scripts_OPTIONS_EXEMPT) \ + $(sysv_OPTIONS_EXEMPT) + if USE_DIETLIBC DIET = diet DIET_FLAGS = DIET_CC := $(DIET) $(DIET_FLAGS) $(CC) 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!@'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 pathconfig.h: .pathconfig.h.pathsubst.stamp .%.pathsubst.stamp: %.pathsubst Makefile @mkdir -p $$(dirname '$@') @echo "sed -e '...' $*.pathsubst >$*" - @sed -e 's!@'PKGLIBDIR'@!$(pkglibdir)!g; \ - s!@'SBINDIR'@!$(sbindir)!g; \ - s!@'CONFDIR'@!$(confdir)!g; \ - s!@'SYSCONFDIR'@!$(sysconfdir)!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!@'WC'@!$(WC)!g; \ - ' '$<' >'$@.tmp' + @sed -e '$(pathsubst_RULES)' '$<' >'$@.tmp' + @-chmod --reference='$<' '$@.tmp' @if cmp -s '$@.tmp' '$*'; then \ echo "... no changes, reusing old version"; \ rm -f '$@.tmp'; \ @@ -106,9 +140,26 @@ pathconfig.h: .pathconfig.h.pathsubst.stamp @chmod a-w '$*' @touch '$@' -install-data-local: - $(INSTALL) -d -m755 $(DESTDIR)$(localstatedir)/run/vservers +pkgstatedir = $(localstatedir)/run/vservers +pkgstaterevdir = $(pkgstatedir).rev +vserverpkgdir = $(vserverdir)/.pkg + +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-vserverdir: + $(mkinstalldirs) $(DESTDIR)$(vserverdir) $(DESTDIR)$(vserverpkgdir) +if USE_DIETLIBC +$(DIETPROGS): LIBTOOL=$(LIBTOOL) --tag CC + +$(addsuffix $(EXEEXT), $(DIETPROGS)) \ +$(addsuffix $(OBJEXT), $(DIETPROGS)) \ + : CC=$(DIET_CC) +endif include $(top_srcdir)/lib/Makefile-files include $(top_srcdir)/src/Makefile-files