X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=3bac059f8889e6dec690886c17093283219a38c5;hb=537f49ccb17c7bb2b5f89e057111f7f7087a3b1a;hp=82c3ffed26e37b811cb5054e9249162a804e0566;hpb=745b95ee56b3e3dda29eaab6bd48c8ebf9b83ac8;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 82c3ffe..3bac059 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -20,41 +20,58 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = . distrib -sysvdir = $(sysconfdir)/init.d +CVS2CL_AMFLAGS = $(CVS2CL_TAG) -U cvsusers.map --show-dead +CVS2CL_ALLFLAGS := $(CVS2CL_AMFLAGS) $(CVS2CL_FLAGS) + confdir = $(sysconfdir)/vservers +sbincfgdir = $(sbindir) include_HEADERS = $(lib_HDRS) -noinst_HEADERS = $(src_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) +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) -conf_DATA = newvserver.defaults -BUILT_SOURCES = linuxcaps.h +DIETPROGS = $(src_DIETPROGS) $(tests_DIETPROGS) + +BUILT_SOURCES = linuxcaps.h pathconfig.h linuxvirtual.h man_MANS = $(man_DATMAN) +m4_FILES = m4/ensc_cflags.m4 m4/ensc_kerneldir.m4 \ + m4/ensc_changelog.m4 m4/ensc_uv_vrootdir.m4 \ + m4/ensc_fpicsyscall.m4 m4/ensc_cxxcompiler.m4 + +EXTRA_PROGRAMS = $(src_EXTRA_PROGS) EXTRA_DIST = $(sysv_XTRAS) $(sysv_CFG) \ $(doc_DAT) $(man_DATMAN) \ - $(scripts_SCRPTS) $(scripts_PRGS) $(scripts_XTRAS) \ - vserver.spec newvserver.defaults \ - m4/ensc_cflags.m4 \ + $(scripts_XTRAS) $(m4_FILES) \ + pathconfig.h.pathsubst \ + util-vserver.spec \ THANKS -AM_CPPFLAGS = -I $(top_srcdir)/lib -D VERSION=\"$(VERSION)\" -D PKGLIBDIR=\"$(pkglibdir)\" -D _GNU_SOURCE -AM_CFLAGS = -Wall -pedantic +AM_CPPFLAGS = -I $(top_srcdir)/lib -D _GNU_SOURCE $(RELEASE_CPPFLAGS) -CLEANFILES = $(sysv_GENSCRPTS) $(scripts_GENSCRPTS) linuxcaps.h +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 @@ -62,9 +79,77 @@ 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: + ln -sf '$(kernelincludedir)/linux/virtual.h' '$@' && test -e '$@' || \ + ln -sf '$(top_srcdir)/lib/virtual.h' '$@' + +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 '$(pathsubst_RULES)' '$<' >'$@.tmp' + @-chmod --reference='$<' '$@.tmp' + @if cmp -s '$@.tmp' '$*'; then \ + echo "... no changes, reusing old version"; \ + rm -f '$@.tmp'; \ + else \ + rm -f '$*'; mv '$@.tmp' '$*'; \ + fi + @chmod a-w '$*' + @touch '$@' + +pkgstatedir = $(localstatedir)/run/vservers +pkgstaterevdir = $(pkgstatedir).rev +vserverpkgdir = $(vserverdir)/.pkg + +install-data-hook: + $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgstatedir) $(DESTDIR)$(pkgstaterevdir) + +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 @@ -77,3 +162,4 @@ include $(top_srcdir)/sysv/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