X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=b4ea396317af8a7e360b7f1bf266047d9155a9d6;hb=775ce825fa3ea0ead6d9ee092c4d17f4eb5b8769;hp=a809480ea033502813fb16f976db6a5dc569b4ce;hpb=4343622a8e26b59cd42b6fe60c36eacba7a76540;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index a809480..b4ea396 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -28,19 +28,21 @@ confdefaultsdir = $(confdir)/.defaults sbincfgdir = $(sbindir) legacydir = $(pkglibdir)/legacy -include_HEADERS = $(lib_HDRS) -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) +include_HEADERS = $(lib_HDRS) +noinst_HEADERS = $(src_HDRS) $(lib_XHDRS) \ + $(lib_internal_libinternal_a_XHDRS) \ + $(ENSC_VECTOR_HDRS) $(ENSC_VECTOR_XHDRS) \ + $(ENSC_WRAPPERS_HDRS) \ + compat.h compat-c99.h + +noinst_LIBRARIES = $(src_lib_LIBS) $(ENSC_VECTOR_LIBS) $(lib_internal_LIBS) lib_LIBRARIES = $(lib_lib_LIBS) lib_LTLIBRARIES = $(lib_lib_LTLIBS) $(src_lib_LTLIBS) pkglib_LTLIBRARIES = $(src_pkglib_LTLIBS) pkglib_SCRIPTS = $(scripts_pkglib_SCRPTS) -pkglib_DATA = $(scripts_pkglib_DTA) +pkglib_DATA = $(scripts_pkglib_DTA) \ + FEATURES.txt pkglib_PROGRAMS = $(src_pkglib_PRGS) legacy_SCRIPTS = $(scripts_legacy_SCRPTS) @@ -54,8 +56,9 @@ noinst_DATA = $(contrib_DTA) $(doc_DAT) initrd_SCRIPTS = $(sysv_SCRPTS) sysconf_DATA = $(sysv_CFG) -DIETPROGS = $(src_DIETPROGS) $(tests_DIETPROGS) $(lib_DIETPROGS) \ - $(ENSC_VECTOR_LIBS) +DIETPROGS = $(src_DIETPROGS) $(tests_DIETPROGS) $(lib_DIETPROGS) \ + $(lib_internal_DIETPROGS) + $(ENSC_VECTOR_LIBS) BUILT_SOURCES = linuxcaps.h pathconfig.h linuxvirtual.h @@ -70,9 +73,11 @@ EXTRA_DIST = $(sysv_XTRAS) $(sysv_CFG) \ util-vserver.spec \ THANKS -check_PROGRAMS = $(src_check_PRGS) $(ENSC_VECTOR_TESTSUITE_PRGS) -check_SCRIPTS = $(src_check_SCRPTS) -TESTS = $(src_TSTS) $(ENSC_VECTOR_TESTSUITE_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) @@ -83,20 +88,35 @@ CLEANFILES = $(sysv_GENSCRPTS) $(scripts_CLEANFILES) $(BUILT_SOURCES) \ .*.pathsubst.stamp */.*.pathsubst.stamp */*/.*.pathsubst.stamp \ linuxcaps.h pathconfig.h +DISTCLEANFILES = FEATURES.txt + + AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = $(src_OPTIONS_EXEMPT) \ $(scripts_OPTIONS_EXEMPT) \ $(sysv_OPTIONS_EXEMPT) +LIBTOOL_CC = @LIBTOOL@ --tag CC +LIBTOOL_CXX = @LIBTOOL@ --tag CXX + if USE_DIETLIBC DIET = diet DIET_FLAGS = DIET_CC := $(DIET) $(DIET_FLAGS) $(CC) -DIET_LIBTOOL := $(LIBTOOL) --tag CC +DIET_LIBTOOL := $(LIBTOOL_CC) VSERVER_LDFLAGS := -static else VSERVER_LDFLAGS := endif +if USE_DIETLIBC_COMPAT +DIET_COMPAT_LDADDS = -lcompat +else +DIET_COMPAT_LDADDS = +endif + +VSERVER_LDADDS = lib/libvserver.la $(DIET_COMPAT_LDADDS) + + linuxcaps.h: ${kernelincludedir}/linux/capability.h Makefile @rm -f $@ echo '#include ' >$@.tmp @@ -143,7 +163,11 @@ pathsubst_RULES = s!@'PKGLIBDIR'@!$(pkglibdir)!g; \ s!@'VCONFIG'@!$(VCONFIG)!g; \ s!@'PS'@!$(PS)!g; \ s!@'WC'@!$(WC)!g; \ - s!@'WGET'@!$(WGET)!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 @@ -208,6 +232,7 @@ 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)/lib_internal/Makefile-files include $(top_srcdir)/m4/gpgsig.am include $(top_srcdir)/m4/validate.am