X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=79aa3909759c52c3321d860aac424714d938e363;hb=324cacc025cfd097a6183532ebc6d32b85005453;hp=a466273dc51186efc963b5890072b53697aece19;hpb=1c29d7bcb9f9458a98f701b7fb0129495d8c06bc;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index a466273..79aa390 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -18,17 +18,21 @@ # 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) -pkglib_SCRIPTS = $(distrib_SCRPTS) $(scripts_SCRPTS) -pkglib_DATA = $(distrib_DAT) $(scriptscfg_DATA) +pkglib_SCRIPTS = $(scripts_SCRPTS) +pkglib_DATA = $(scriptscfg_DATA) $(scripts_DTA) pkglib_PROGRAMS = $(src_pkglib_PRGS) sbin_SCRIPTS = $(scripts_PRGS) @@ -37,24 +41,27 @@ noinst_PROGRAMS = $(test_PRGS) sysv_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) -EXTRA_DIST = $(distrib_SCRPTS) $(distrib_DAT) \ - $(sysv_XTRAS) $(sysv_CFG) \ +EXTRA_DIST = $(sysv_XTRAS) $(sysv_CFG) \ $(doc_DAT) $(man_DATMAN) \ $(scripts_SCRPTS) $(scripts_PRGS) $(scripts_XTRAS) \ - vserver.spec newvserver.defaults \ + pathconfig.h.pathsubst \ + util-vserver.spec \ m4/ensc_cflags.m4 \ THANKS -AM_CPPFLAGS = -I $(top_srcdir)/lib -D VERSION=\"$(VERSION)\" -D PKGLIBDIR=\"$(pkglibdir)\" -D _GNU_SOURCE +AM_CPPFLAGS = -I $(top_srcdir)/lib -D _GNU_SOURCE AM_CFLAGS = -Wall -pedantic -CLEANFILES = $(sysv_GENSCRPTS) $(scripts_GENSCRPTS) linuxcaps.h +CLEANFILES = $(sysv_GENSCRPTS) $(scripts_GENSCRPTS) $(BUILT_SOURCES) \ + .*.pathsubst.stamp */.*.pathsubst.stamp \ + linuxcaps.h pathconfig.h if USE_DIETLIBC DIET = diet @@ -63,12 +70,55 @@ DIET_CC := $(DIET) $(DIET_FLAGS) $(CC) endif linuxcaps.h: - ln -sf ${kernelincludedir}/linux/capability.h linuxcaps.h + ln -sf ${kernelincludedir}/linux/capability.h linuxcaps.h + +linuxvirtual.h: + ln -sf '$(kernelincludedir)/linux/virtual.h' '$@' && test -e '$@' || \ + ln -sf '$(top_srcdir)/lib/virtual.h' '$@' + +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' + @if cmp -s '$@.tmp' '$*'; then \ + echo "... no changes, reusing old version"; \ + rm -f '$@.tmp'; \ + else \ + rm -f '$*'; mv '$@.tmp' '$*'; \ + fi + @chmod a-w '$*' + @touch '$@' + +install-data-local: + $(INSTALL) -d -m755 $(DESTDIR)$(localstatedir)/run/vservers +if USE_DIETLIBC +$(addsuffix $(EXEEXT), $(DIETPROGS)) \ +$(addsuffix $(OBJEXT), $(DIETPROGS)) \ + : CC=$(DIET_CC) +endif include $(top_srcdir)/lib/Makefile-files include $(top_srcdir)/src/Makefile-files -include $(top_srcdir)/distrib/Makefile-files include $(top_srcdir)/doc/Makefile-files include $(top_srcdir)/man/Makefile-files include $(top_srcdir)/scripts/Makefile-files @@ -78,3 +128,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