X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=7915f459da4c943a03f0e2606dae430a15f54577;hb=fb2144cff0e2e67d101329f45ecd7e3c2f760991;hp=f265b53c01748d240809d41715452346023adb85;hpb=250cc61db6cc695cdaf1e83dad544ed8ee87a153;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index f265b53..7915f45 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -20,7 +20,7 @@ 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 @@ -51,14 +51,16 @@ 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_XTRAS) \ + $(scripts_XTRAS) $(m4_FILES) \ pathconfig.h.pathsubst \ util-vserver.spec \ - m4/ensc_cflags.m4 m4/ensc_fpicsyscall.m4 \ - m4/ensc_cxxcompiler.m4 \ THANKS AM_CPPFLAGS = -I $(top_srcdir)/lib -D _GNU_SOURCE $(RELEASE_CPPFLAGS) @@ -77,8 +79,14 @@ 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 '$@' || \