X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=52dd450ff31216a52cb62648c67624a2b60b2041;hb=1c06f3a52e3719e75d2d5919d3bc513d3f432831;hp=17ff7bb3d180ac1456db89b73cf24fb3829393b1;hpb=9bf2c8e42990264a62c91f1fe26a4353a389bb4b;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 17ff7bb..52dd450 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -1,6 +1,6 @@ ## $Id$ -# Copyright (C) 2003 Enrico Scholz +# Copyright (C) 2003,2004 Enrico Scholz # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,7 +29,7 @@ sbincfgdir = $(sbindir) legacydir = $(pkglibdir)/legacy include_HEADERS = $(lib_HDRS) -noinst_HEADERS = $(src_HDRS) $(lib_XHDRS) compat.h +noinst_HEADERS = $(src_HDRS) $(lib_XHDRS) compat.h compat-c99.h lib_LIBRARIES = $(lib_lib_LIBS) lib_LTLIBRARIES = $(lib_lib_LTLIBS) $(src_lib_LTLIBS) @@ -42,9 +42,10 @@ legacy_SCRIPTS = $(scripts_legacy_SCRPTS) sbincfg_DATA = $(scripts_sbincfg_DTA) -sbin_SCRIPTS = $(scripts_sbin_PRGS) +sbin_SCRIPTS = $(scripts_sbin_PRGS) $(src_sbin_SCRPTS) sbin_PROGRAMS = $(src_sbin_PRGS) noinst_PROGRAMS = $(test_PRGS) +noinst_DATA = $(contrib_DTA) initrd_SCRIPTS = $(sysv_SCRPTS) sysconf_DATA = $(sysv_CFG) @@ -55,13 +56,14 @@ BUILT_SOURCES = linuxcaps.h pathconfig.h linuxvirtual.h man_MANS = $(man_DATMAN) -EXTRA_PROGRAMS = $(src_EXTRA_PROGS) -EXTRA_DIST = $(sysv_XTRAS) $(sysv_CFG) \ - $(doc_DAT) $(man_DATMAN) \ - $(scripts_XTRAS) $(src_XTRAS) \ - pathconfig.h.pathsubst \ - util-vserver.spec \ - THANKS +EXTRA_PROGRAMS = $(src_EXTRA_PROGS) +EXTRA_DIST = $(sysv_XTRAS) $(sysv_CFG) \ + $(doc_DAT) $(man_DATMAN) \ + $(scripts_XTRAS) $(src_XTRAS) \ + $(contrib_XTRAS) \ + pathconfig.h.pathsubst \ + util-vserver.spec \ + THANKS check_PROGRAMS = $(src_check_PRGS) check_SCRIPTS = $(src_check_SCRPTS) @@ -71,9 +73,10 @@ TESTS_ENVIRONMENT = $(src_TESTS_ENV) AM_CPPFLAGS = -I $(top_srcdir)/lib -D _GNU_SOURCE $(RELEASE_CPPFLAGS) -CLEANFILES = $(sysv_GENSCRPTS) $(scripts_CLEANFILES) $(BUILT_SOURCES) \ - .*.pathsubst.stamp */.*.pathsubst.stamp \ - linuxcaps.h pathconfig.h +CLEANFILES = $(sysv_GENSCRPTS) $(scripts_CLEANFILES) $(BUILT_SOURCES) \ + $(contrib_CLEANFILES) \ + .*.pathsubst.stamp */.*.pathsubst.stamp */*/.*.pathsubst.stamp \ + linuxcaps.h pathconfig.h AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = $(src_OPTIONS_EXEMPT) \ $(scripts_OPTIONS_EXEMPT) \ @@ -107,6 +110,7 @@ else endif pathsubst_RULES = s!@'PKGLIBDIR'@!$(pkglibdir)!g; \ + s!@'LEGACYDIR'@!$(legacydir)!g; \ s!@'SBINDIR'@!$(sbindir)!g; \ s!@'CONFDIR'@!$(confdir)!g; \ s!@'SYSCONFDIR'@!$(sysconfdir)!g; \ @@ -117,6 +121,7 @@ pathsubst_RULES = s!@'PKGLIBDIR'@!$(pkglibdir)!g; \ s!@'VSERVERPKGDIR'@!$(vserverpkgdir)!g; \ s!@'INITRDDIR'@!$(initrddir)!g; \ s!@'LIBDIR'@!$(libdir)!g; \ + s!@'MANDIR'@!$(mandir)!g; \ s!@'INCLUDEDIR'@!$(includedir)!g; \ s!@'PACKAGE_BUGREPORT'@!$(PACKAGE_BUGREPORT)!g; \ s!@'PACKAGE_NAME'@!$(PACKAGE_NAME)!g; \ @@ -130,6 +135,7 @@ pathsubst_RULES = s!@'PKGLIBDIR'@!$(pkglibdir)!g; \ s!@'UMOUNT'@!$(UMOUNT)!g; \ s!@'NICE'@!$(NICE)!g; \ s!@'VCONFIG'@!$(VCONFIG)!g; \ + s!@'PS'@!$(PS)!g; \ s!@'WC'@!$(WC)!g pathconfig.h: .pathconfig.h.pathsubst.stamp @@ -177,6 +183,7 @@ include $(top_srcdir)/man/Makefile-files 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)/m4/gpgsig.am include $(top_srcdir)/m4/validate.am