X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=9ad948737f4415f7deeb896585630a54654d0984;hb=c379a190b0c8f633c6daca9586cc44b5bc4f4c28;hp=99275531b6d758622c53a38e3da84825ecec84a4;hpb=b6fd8dbf1ead0c762a1d07776746a5daee5a1085;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 9927553..9ad9487 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -28,70 +28,79 @@ confdefaultsdir = $(confdir)/.defaults sbincfgdir = $(sbindir) legacydir = $(pkglibdir)/legacy -include_HEADERS = $(lib_HDRS) -noinst_HEADERS = $(src_HDRS) $(lib_XHDRS) compat.h compat-c99.h +include_HEADERS = +noinst_HEADERS = $(ENSC_VECTOR_HDRS) \ + compat.h compat-c99.h -lib_LIBRARIES = $(lib_lib_LIBS) -lib_LTLIBRARIES = $(lib_lib_LTLIBS) $(src_lib_LTLIBS) -pkglib_LTLIBRARIES = $(src_pkglib_LTLIBS) +noinst_LIBRARIES = $(ENSC_VECTOR_LIBS) +lib_LIBRARIES = +lib_LTLIBRARIES = +pkglib_LTLIBRARIES = -pkglib_SCRIPTS = $(scripts_pkglib_SCRPTS) -pkglib_DATA = $(scripts_pkglib_DTA) -pkglib_PROGRAMS = $(src_pkglib_PRGS) -legacy_SCRIPTS = $(scripts_legacy_SCRPTS) +pkglib_SCRIPTS = +pkglib_DATA = FEATURES.txt +pkglib_PROGRAMS = +legacy_SCRIPTS = +legacy_PROGRAMS = -sbincfg_DATA = $(scripts_sbincfg_DTA) +sbin_SCRIPTS = +sbin_PROGRAMS = +noinst_PROGRAMS = +noinst_DATA = -sbin_SCRIPTS = $(scripts_sbin_PRGS) $(src_sbin_SCRPTS) -sbin_PROGRAMS = $(src_sbin_PRGS) -noinst_PROGRAMS = $(test_PRGS) -noinst_DATA = $(contrib_DTA) $(doc_DAT) +initrd_SCRIPTS = +sysconf_DATA = -initrd_SCRIPTS = $(sysv_SCRPTS) -sysconf_DATA = $(sysv_CFG) +DIETPROGS = $(ENSC_VECTOR_LIBS) -DIETPROGS = $(src_DIETPROGS) $(tests_DIETPROGS) $(lib_DIETPROGS) +BUILT_SOURCES = linuxcaps.h pathconfig.h linuxvirtual.h -BUILT_SOURCES = linuxcaps.h pathconfig.h linuxvirtual.h +man_MANS = -man_MANS = $(man_DATMAN) - -EXTRA_PROGRAMS = $(src_EXTRA_PROGS) -EXTRA_DIST = $(sysv_XTRAS) $(sysv_CFG) \ - $(doc_DAT) $(man_DATMAN) \ - $(scripts_XTRAS) $(src_XTRAS) \ - $(contrib_XTRAS) \ - pathconfig.h.pathsubst \ +EXTRA_PROGRAMS = +EXTRA_DIST = pathconfig.h.pathsubst \ util-vserver.spec \ THANKS -check_PROGRAMS = $(src_check_PRGS) -check_SCRIPTS = $(src_check_SCRPTS) -TESTS = $(src_TSTS) +check_PROGRAMS = +check_SCRIPTS = +TESTS = -TESTS_ENVIRONMENT = $(src_TESTS_ENV) +TESTS_ENVIRONMENT = -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) \ +CLEANFILES = $(BUILT_SOURCES) \ .*.pathsubst.stamp */.*.pathsubst.stamp */*/.*.pathsubst.stamp \ linuxcaps.h pathconfig.h -AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = $(src_OPTIONS_EXEMPT) \ - $(scripts_OPTIONS_EXEMPT) \ - $(sysv_OPTIONS_EXEMPT) +DISTCLEANFILES = FEATURES.txt + + +AM_INSTALLCHECK_STD_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 @@ -137,7 +146,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 @@ -160,7 +174,8 @@ vserverpkgdir = $(vserverdir)/.pkg fix_SCRPTS = $(addprefix $(pkglibdir)/, $(notdir $(pkglib_SCRIPTS))) \ $(addprefix $(legacydir)/, $(notdir $(legacy_SCRIPTS))) \ - $(addprefix $(sbindir)/, $(notdir $(sbin_SCRIPTS))) + $(addprefix $(sbindir)/, $(notdir $(sbin_SCRIPTS))) \ + $(addprefix $(initrddir)/, $(notdir $(initrd_SCRIPTS))) install-data-hook: install-fix-script-paths install-create-dirs @@ -200,6 +215,9 @@ 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)/lib_internal/Makefile-files include $(top_srcdir)/m4/gpgsig.am include $(top_srcdir)/m4/validate.am