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=b4ea396317af8a7e360b7f1bf266047d9155a9d6;hpb=9b28982e8a9f5a870c02d95ec40a4256e955bb16;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index b4ea396..9ad9487 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -28,72 +28,56 @@ confdefaultsdir = $(confdir)/.defaults sbincfgdir = $(sbindir) legacydir = $(pkglibdir)/legacy -include_HEADERS = $(lib_HDRS) -noinst_HEADERS = $(src_HDRS) $(lib_XHDRS) \ - $(lib_internal_libinternal_a_XHDRS) \ - $(ENSC_VECTOR_HDRS) $(ENSC_VECTOR_XHDRS) \ - $(ENSC_WRAPPERS_HDRS) \ +include_HEADERS = +noinst_HEADERS = $(ENSC_VECTOR_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) +noinst_LIBRARIES = $(ENSC_VECTOR_LIBS) +lib_LIBRARIES = +lib_LTLIBRARIES = +pkglib_LTLIBRARIES = -pkglib_SCRIPTS = $(scripts_pkglib_SCRPTS) -pkglib_DATA = $(scripts_pkglib_DTA) \ - FEATURES.txt -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 = $(src_DIETPROGS) $(tests_DIETPROGS) $(lib_DIETPROGS) \ - $(lib_internal_DIETPROGS) - $(ENSC_VECTOR_LIBS) +DIETPROGS = $(ENSC_VECTOR_LIBS) BUILT_SOURCES = linuxcaps.h pathconfig.h linuxvirtual.h -man_MANS = $(man_DATMAN) +man_MANS = -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) $(lib_testsuite_PRGS) \ - $(ENSC_VECTOR_TESTSUITE_PRGS) -check_SCRIPTS = $(src_check_SCRPTS) -TESTS = $(src_TSTS) $(lib_testsuite_TSTS) \ - $(ENSC_VECTOR_TESTSUITE_TSTS) +check_PROGRAMS = +check_SCRIPTS = +TESTS = -TESTS_ENVIRONMENT = $(src_TESTS_ENV) +TESTS_ENVIRONMENT = 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 DISTCLEANFILES = FEATURES.txt -AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = $(src_OPTIONS_EXEMPT) \ - $(scripts_OPTIONS_EXEMPT) \ - $(sysv_OPTIONS_EXEMPT) +AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = LIBTOOL_CC = @LIBTOOL@ --tag CC LIBTOOL_CXX = @LIBTOOL@ --tag CXX @@ -190,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