X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=a9e628c40d705cdf7c4c248920b17c992badb479;hb=7097f43356e2df716c51602e2145e21104913ed9;hp=439aabd6043890bbfe793e00982671ce98b79459;hpb=6f13899138801f2a5394e178727c6cd64e2945fa;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 439aabd..a9e628c 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -35,15 +35,17 @@ noinst_HEADERS = $(src_HDRS) $(lib_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_PROGRAMS = $(src_pkglib_PRGS) -legacy_SCRIPTS = $(scripts_legacy_SCRPTS) +pkglib_DATA = $(scripts_pkglib_DTA) \ + FEATURES.txt +pkglib_PROGRAMS = $(src_pkglib_PRGS) +legacy_SCRIPTS = $(scripts_legacy_SCRPTS) $(src_legacy_SCRPTS) +legacy_PROGRAMS = $(src_legacy_PRGS) sbincfg_DATA = $(scripts_sbincfg_DTA) @@ -87,20 +89,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