X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=36284dfa0ed28e9ef68a7453c03b98224e26a443;hb=332283f4293d66f246313019230d99d633ff7e62;hp=dd84249f47c6b054c62243dfa1469a722fff84b1;hpb=bd2f6b7c8a7cf44e7ef58f246e2ae4cda9c86b58;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index dd84249..36284df 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -20,16 +20,20 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = . distrib +CVS2CL_AMFLAGS = $(CVS2CL_TAG) -U cvsusers.map +CVS2CL_ALLFLAGS := $(CVS2CL_AMFLAGS) $(CVS2CL_FLAGS) + sysvdir = $(sysconfdir)/init.d confdir = $(sysconfdir)/vservers 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_DATA = $(scriptscfg_DATA) $(scripts_DTA) pkglib_PROGRAMS = $(src_pkglib_PRGS) sbin_SCRIPTS = $(scripts_PRGS) @@ -39,24 +43,32 @@ noinst_PROGRAMS = $(test_PRGS) sysv_SCRIPTS = $(sysv_SCRPTS) sysconf_DATA = $(sysv_CFG) -BUILT_SOURCES = linuxcaps.h pathconfig.h +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) \ pathconfig.h.pathsubst \ util-vserver.spec \ - m4/ensc_cflags.m4 \ + m4/ensc_cflags.m4 m4/ensc_fpicsyscall.m4 \ + m4/ensc_cxxcompiler.m4 \ THANKS AM_CPPFLAGS = -I $(top_srcdir)/lib -D _GNU_SOURCE -AM_CFLAGS = -Wall -pedantic -CLEANFILES = $(sysv_GENSCRPTS) $(scripts_GENSCRPTS) \ +CLEANFILES = $(sysv_GENSCRPTS) $(scripts_GENSCRPTS) $(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 = @@ -66,15 +78,55 @@ endif linuxcaps.h: ln -sf ${kernelincludedir}/linux/capability.h linuxcaps.h -%: %.pathsubst Makefile +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!@'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 + +pathconfig.h: .pathconfig.h.pathsubst.stamp +.%.pathsubst.stamp: %.pathsubst Makefile @mkdir -p $$(dirname '$@') - sed -e 's!@'PKGLIBDIR'@!$(pkglibdir)!g; \ - s!@'SBINDIR'@!$(sbindir)!g; \ - s!@'CONFDIR'@!$(confdir)!g; \ - s!@'SYSCONFDIR'@!$(sysconfdir)!g' '$<' >'$@.tmp' - if cmp -s '$@.tmp' '$@'; then rm -f '$@.tmp'; else rm -f '$@'; mv '$@.tmp' '$@'; fi - @chmod a-w '$@' + @echo "sed -e '...' $*.pathsubst >$*" + @sed -e '$(pathsubst_RULES)' '$<' >'$@.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 +install-data-local: + $(INSTALL) -d -m755 $(DESTDIR)$(pkgstatedir) +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 @@ -87,3 +139,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