X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=4e62d7e06c2085291f6e4dbd357a913b2c69236a;hb=9f111f25b21d72d820c8b05410577d9fb2692995;hp=acb2d0609168d82bf04e3cadf757d34fe66f041c;hpb=9105191a46ff0e27dfafebd386a4d50c26c7f439;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index acb2d06..4e62d7e 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -19,8 +19,12 @@ ACLOCAL_AMFLAGS = -I m4 +CVS2CL_AMFLAGS = $(CVS2CL_TAG) -U cvsusers.map --show-dead +CVS2CL_ALLFLAGS := $(CVS2CL_AMFLAGS) $(CVS2CL_FLAGS) + sysvdir = $(sysconfdir)/init.d vservercfgdir = $(sysconfdir)/vservers +legacydir = $(pkglibdir)/legacy include_HEADERS = $(lib_HDRS) noinst_HEADERS = $(src_HDRS) $(lib_XHDRS) compat.h @@ -31,6 +35,8 @@ pkglib_SCRIPTS = $(distrib_SCRPTS) $(scripts_SCRPTS) $(src_pkglib_SCRPTS) pkglib_DATA = $(distrib_DAT) $(scriptscfg_DATA) pkglib_PROGRAMS = $(src_pkglib_PRGS) +legacy_SCRIPTS = $(scripts_LEGSCRPTS) + sbin_SCRIPTS = $(scripts_PRGS) $(linuxconf_SCRPTS) sbin_PROGRAMS = $(src_sbin_PRGS) noinst_PROGRAMS = $(test_PRGS) @@ -43,13 +49,15 @@ BUILT_SOURCES = linuxcaps.h linuxvirtual.h man_MANS = $(man_DATMAN) $(linuxconf_DATMAN) +m4_FILES = m4/ensc_cflags.m4 m4/ensc_kerneldir.m4 \ + m4/ensc_changelog.m4 m4/ensc_uv_vrootdir.m4 + EXTRA_DIST = $(distrib_SCRPTS) $(distrib_DAT) \ $(sysv_XTRAS) $(sysv_CFG) \ $(doc_DAT) $(man_DATMAN) $(linuxconf_XTRAS) \ $(scripts_SCRPTS) $(scripts_XTRAS) \ - util-vserver.spec \ - m4/ensc_cflags.m4 m4/ensc_kerneldir.m4 \ - THANKS + $(m4_FILES) \ + util-vserver.spec THANKS AM_CPPFLAGS = -I $(top_srcdir)/lib -D VERSION=\"$(VERSION)\" -D PKGLIBDIR=\"$(pkglibdir)\" -D _GNU_SOURCE AM_CFLAGS = -Wall -pedantic @@ -59,12 +67,21 @@ CLEANFILES = $(sysv_GENSCRPTS) $(scripts_GENSCRPTS) \ $(BUILT_SOURCES) -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 include $(top_srcdir)/lib/Makefile-files include $(top_srcdir)/src/Makefile-files