From: Enrico Scholz Date: Tue, 30 Sep 2003 19:12:11 +0000 (+0000) Subject: use recursive make for distrib: added it to SUBDIRS and remove old X-Git-Tag: VERSION_0_10~1339 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=745b95ee56b3e3dda29eaab6bd48c8ebf9b83ac8;p=util-vserver.git use recursive make for distrib: added it to SUBDIRS and remove old $(distrib_*) variables git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@15 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index a466273..82c3ffe 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -18,6 +18,7 @@ # ACLOCAL_AMFLAGS = -I m4 +SUBDIRS = . distrib sysvdir = $(sysconfdir)/init.d confdir = $(sysconfdir)/vservers @@ -27,8 +28,8 @@ noinst_HEADERS = $(src_HDRS) lib_LIBRARIES = $(lib_lib_LIBS) -pkglib_SCRIPTS = $(distrib_SCRPTS) $(scripts_SCRPTS) -pkglib_DATA = $(distrib_DAT) $(scriptscfg_DATA) +pkglib_SCRIPTS = $(scripts_SCRPTS) +pkglib_DATA = $(scriptscfg_DATA) pkglib_PROGRAMS = $(src_pkglib_PRGS) sbin_SCRIPTS = $(scripts_PRGS) @@ -43,8 +44,7 @@ BUILT_SOURCES = linuxcaps.h man_MANS = $(man_DATMAN) -EXTRA_DIST = $(distrib_SCRPTS) $(distrib_DAT) \ - $(sysv_XTRAS) $(sysv_CFG) \ +EXTRA_DIST = $(sysv_XTRAS) $(sysv_CFG) \ $(doc_DAT) $(man_DATMAN) \ $(scripts_SCRPTS) $(scripts_PRGS) $(scripts_XTRAS) \ vserver.spec newvserver.defaults \ @@ -68,7 +68,6 @@ linuxcaps.h: include $(top_srcdir)/lib/Makefile-files include $(top_srcdir)/src/Makefile-files -include $(top_srcdir)/distrib/Makefile-files include $(top_srcdir)/doc/Makefile-files include $(top_srcdir)/man/Makefile-files include $(top_srcdir)/scripts/Makefile-files