X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.am;h=64ee9b792ab3d2ebaacce715192ba3a57c8cf403;hb=HEAD;hp=3f7370cca17d137172e7ef4f23561ebc7d3eba7d;hpb=9c78378bebc1a9f3d400f422df8ede9efea57dea;p=util-vserver.git diff --git a/Makefile.am b/Makefile.am index 3f7370c..64ee9b7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,9 +20,6 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = . distrib -CVS2CL_AMFLAGS = $(CVS2CL_TAG) -U cvsusers.map --show-dead -S --no-wrap -CVS2CL_ALLFLAGS := $(CVS2CL_AMFLAGS) $(CVS2CL_FLAGS) - confdir = $(sysconfdir)/vservers confdefaultsdir = $(confdir)/.defaults sbincfgdir = $(sbindir) @@ -51,6 +48,9 @@ noinst_DATA = initrd_SCRIPTS = sysconf_DATA = +pyexec_LTLIBRARIES = +pyexec_SCRIPTS = + DIETPROGS = $(LIBENSCVECTOR_DIET) BUILT_SOURCES = pathconfig.h \ @@ -58,33 +58,8 @@ BUILT_SOURCES = pathconfig.h \ man_MANS = -kernel_HDRS = \ - kernel/context.h \ - kernel/context_cmd.h \ - kernel/cvirt.h \ - kernel/cvirt_cmd.h \ - kernel/cvirt_def.h \ - kernel/debug.h \ - kernel/debug_cmd.h \ - kernel/dlimit.h \ - kernel/dlimit_cmd.h \ - kernel/inode.h \ - kernel/inode_cmd.h \ - kernel/legacy.h \ - kernel/limit.h \ - kernel/limit_cmd.h \ - kernel/limit_def.h \ - kernel/namespace.h \ - kernel/namespace_cmd.h \ - kernel/network.h \ - kernel/network_cmd.h \ - kernel/sched.h \ - kernel/sched_cmd.h \ - kernel/sched_def.h \ - kernel/signal_cmd.h \ - kernel/switch.h \ - kernel/xid.h - +kernel_HDRS = \ + $(patsubst ${srcdir}/%,%,$(wildcard ${srcdir}/kernel/*.h)) EXTRA_PROGRAMS = @@ -166,6 +141,9 @@ pathsubst_RULES = s!@'PKGLIBDIR'@!$(pkglibdir)!g; \ s!@'ENSC_HAVE_C99_COMPILER_FALSE'@!\@ENSC_HAVE_C99_COMPILER_FALSE@ !g; \ s!@'ENSC_HAVE_CXX_COMPILER_TRUE'@!\@ENSC_HAVE_CXX_COMPILER_TRUE@ !g; \ s!@'ENSC_HAVE_CXX_COMPILER_FALSE'@!\@ENSC_HAVE_CXX_COMPILER_FALSE@ !g; \ + s!@'HAVE_PYTHON_TRUE'@!\@HAVE_PYTHON_TRUE@ !g; \ + s!@'HAVE_PYTHON_FALSE'@!\@HAVE_PYTHON_FALSE@ !g; \ + s!@'PYEXECDIR'@!$(pyexecdir)!g; \ $(ENSC_PATHPROG_SED) pathconfig.h: .pathconfig.h.pathsubst.stamp @@ -173,7 +151,7 @@ pathconfig.h: .pathconfig.h.pathsubst.stamp @mkdir -p $$(dirname '$@') @echo "$(SED) -e '...' $*.pathsubst >$*" @$(SED) -e '$(pathsubst_RULES)' '$<' >'$@.tmp' - @-chmod --reference='$<' '$@.tmp' + @-chmod $$(stat -c '%a' '$<') '$@.tmp' @if cmp -s '$@.tmp' '$*'; then \ echo "... no changes, reusing old version"; \ rm -f '$@.tmp'; \ @@ -251,7 +229,12 @@ include $(top_srcdir)/ensc_vector/Makefile-files include $(top_srcdir)/ensc_wrappers/Makefile-files include $(top_srcdir)/ensc_fmt/Makefile-files include $(top_srcdir)/lib_internal/Makefile-files -include $(top_srcdir)/vserver-start/Makefile-files +#include $(top_srcdir)/vserver-start/Makefile-files +include $(top_srcdir)/gentoo/Makefile-files +if HAVE_PYTHON +include $(top_srcdir)/python/Makefile-files +endif +include $(top_srcdir)/debian/Makefile-files include $(top_srcdir)/m4/gpgsig.am include $(top_srcdir)/m4/validate.am