X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=d81ea10942320f19ec9f3392511fb06c3ab71a1a;hb=8d9cbd61ebf24c6800e781a723d4e8da1a5f0cd0;hp=240c56e2f3a306043e655179aedbf9ab393313df;hpb=0ebdfc3bb07f4444dc4353bfebb598163da8fea5;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 240c56e..d81ea10 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -29,8 +29,12 @@ sbincfgdir = $(sbindir) legacydir = $(pkglibdir)/legacy include_HEADERS = $(lib_HDRS) -noinst_HEADERS = $(src_HDRS) $(lib_XHDRS) compat.h compat-c99.h +noinst_HEADERS = $(src_HDRS) $(lib_XHDRS) \ + $(ENSC_VECTOR_HDRS) $(ENSC_VECTOR_XHDRS) \ + $(ENSC_WRAPPERS_HDRS) \ + compat.h compat-c99.h +noinst_LIBRARIES = $(src_lib_LIBS) $(ENSC_VECTOR_LIBS) lib_LIBRARIES = $(lib_lib_LIBS) lib_LTLIBRARIES = $(lib_lib_LTLIBS) $(src_lib_LTLIBS) pkglib_LTLIBRARIES = $(src_pkglib_LTLIBS) @@ -50,11 +54,12 @@ noinst_DATA = $(contrib_DTA) $(doc_DAT) initrd_SCRIPTS = $(sysv_SCRPTS) sysconf_DATA = $(sysv_CFG) -DIETPROGS = $(src_DIETPROGS) $(tests_DIETPROGS) $(lib_DIETPROGS) +DIETPROGS = $(src_DIETPROGS) $(tests_DIETPROGS) $(lib_DIETPROGS) \ + $(ENSC_VECTOR_LIBS) -BUILT_SOURCES = linuxcaps.h pathconfig.h linuxvirtual.h +BUILT_SOURCES = linuxcaps.h pathconfig.h linuxvirtual.h -man_MANS = $(man_DATMAN) +man_MANS = $(man_DATMAN) EXTRA_PROGRAMS = $(src_EXTRA_PROGS) EXTRA_DIST = $(sysv_XTRAS) $(sysv_CFG) \ @@ -65,13 +70,15 @@ EXTRA_DIST = $(sysv_XTRAS) $(sysv_CFG) \ util-vserver.spec \ THANKS -check_PROGRAMS = $(src_check_PRGS) -check_SCRIPTS = $(src_check_SCRPTS) -TESTS = $(src_TSTS) +check_PROGRAMS = $(src_check_PRGS) $(lib_testsuite_PRGS) \ + $(ENSC_VECTOR_TESTSUITE_PRGS) +check_SCRIPTS = $(src_check_SCRPTS) +TESTS = $(src_TSTS) $(lib_testsuite_TSTS) \ + $(ENSC_VECTOR_TESTSUITE_TSTS) TESTS_ENVIRONMENT = $(src_TESTS_ENV) -AM_CPPFLAGS = -I $(top_srcdir)/lib -D _GNU_SOURCE $(RELEASE_CPPFLAGS) +AM_CPPFLAGS = -I $(top_srcdir)/lib -I $(top_srcdir)/ensc_wrappers -D _GNU_SOURCE $(RELEASE_CPPFLAGS) CLEANFILES = $(sysv_GENSCRPTS) $(scripts_CLEANFILES) $(BUILT_SOURCES) \ $(contrib_CLEANFILES) \ @@ -123,6 +130,7 @@ pathsubst_RULES = s!@'PKGLIBDIR'@!$(pkglibdir)!g; \ s!@'LIBDIR'@!$(libdir)!g; \ s!@'MANDIR'@!$(mandir)!g; \ s!@'INCLUDEDIR'@!$(includedir)!g; \ + s!@'PACKAGE'@!$(PACKAGE)!g; \ s!@'PACKAGE_BUGREPORT'@!$(PACKAGE_BUGREPORT)!g; \ s!@'PACKAGE_NAME'@!$(PACKAGE_NAME)!g; \ s!@'PACKAGE_STRING'@!$(PACKAGE_STRING)!g; \ @@ -136,7 +144,12 @@ pathsubst_RULES = s!@'PKGLIBDIR'@!$(pkglibdir)!g; \ s!@'NICE'@!$(NICE)!g; \ s!@'VCONFIG'@!$(VCONFIG)!g; \ s!@'PS'@!$(PS)!g; \ - s!@'WC'@!$(WC)!g + s!@'WC'@!$(WC)!g; \ + s!@'WGET'@!$(WGET)!g; \ + s!@'ENSC_HAVE_C99_COMPILER_TRUE'@!\@ENSC_HAVE_C99_COMPILER_TRUE@ !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; pathconfig.h: .pathconfig.h.pathsubst.stamp .%.pathsubst.stamp: %.pathsubst Makefile @@ -199,6 +212,8 @@ include $(top_srcdir)/scripts/Makefile-files include $(top_srcdir)/tests/Makefile-files include $(top_srcdir)/sysv/Makefile-files include $(top_srcdir)/contrib/Makefile-files +include $(top_srcdir)/ensc_vector/Makefile-files +include $(top_srcdir)/ensc_wrappers/Makefile-files include $(top_srcdir)/m4/gpgsig.am include $(top_srcdir)/m4/validate.am