X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=b4ea396317af8a7e360b7f1bf266047d9155a9d6;hb=b62fe1576311afb7d5cd2120dfc7323875b436d1;hp=2f1dea266962c72ccdbe8405fedc36fc898a1514;hpb=9ce47a864bee3a71042bedc90548a3521ab15705;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 2f1dea2..b4ea396 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -30,18 +30,19 @@ legacydir = $(pkglibdir)/legacy include_HEADERS = $(lib_HDRS) noinst_HEADERS = $(src_HDRS) $(lib_XHDRS) \ - $(lib_internal_libinternal_a_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_LIBRARIES = $(lib_lib_LIBS) $(lib_internal_LIBS) +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) @@ -87,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