From: Enrico Scholz Date: Wed, 10 Mar 2004 02:30:34 +0000 (+0000) Subject: modernized the Makefiles; use '+=' where possible to remove complexity X-Git-Tag: VERSION_0_10~382 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e67039889a7f79e86cb64d397b9e83189b63358;p=util-vserver.git modernized the Makefiles; use '+=' where possible to remove complexity from the toplevel Makefile.am git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1192 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 6ea30f8..9ad9487 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -28,71 +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) $(src_legacy_SCRPTS) -legacy_PROGRAMS = $(src_legacy_PRGS) +pkglib_SCRIPTS = +pkglib_DATA = FEATURES.txt +pkglib_PROGRAMS = +legacy_SCRIPTS = +legacy_PROGRAMS = -sbincfg_DATA = $(scripts_sbincfg_DTA) - -sbin_SCRIPTS = $(scripts_sbin_PRGS) $(src_sbin_SCRPTS) -sbin_PROGRAMS = $(src_sbin_PRGS) -noinst_PROGRAMS = $(test_PRGS) -noinst_DATA = $(contrib_DTA) $(doc_DAT) +sbin_SCRIPTS = +sbin_PROGRAMS = +noinst_PROGRAMS = +noinst_DATA = initrd_SCRIPTS = sysconf_DATA = -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 = $(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 = $(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) +AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = LIBTOOL_CC = @LIBTOOL@ --tag CC LIBTOOL_CXX = @LIBTOOL@ --tag CXX diff --git a/util-vserver/contrib/Makefile-files b/util-vserver/contrib/Makefile-files index 785e68f..99f6e15 100644 --- a/util-vserver/contrib/Makefile-files +++ b/util-vserver/contrib/Makefile-files @@ -22,10 +22,10 @@ contrib_gen_DTA = contrib/manifest.dat contrib_subst_SRCS = contrib/manifest.dat.pathsubst -contrib_DTA = $(contrib_gen_DTA) -contrib_CLEANFILES = $(contrib_gen_DTA) +noinst_DATA += $(contrib_gen_DTA) +CLEANFILES += $(contrib_gen_DTA) -contrib_XTRAS = $(contrib_subst_SRCS) \ +EXTRA_DIST += $(contrib_subst_SRCS) \ contrib/make-manifest contrib/manifest.dat: contrib/.manifest.dat.pathsubst.stamp diff --git a/util-vserver/doc/Makefile-files b/util-vserver/doc/Makefile-files index 2537884..7a9be83 100644 --- a/util-vserver/doc/Makefile-files +++ b/util-vserver/doc/Makefile-files @@ -17,7 +17,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## -doc_DAT = doc/FAQ.txt \ +doc_old_doc = doc/FAQ.txt \ doc/intro.txt XSLT_AMFLAGS = --stringparam confdir '$(sysconfdir)/vservers' @@ -36,6 +36,7 @@ doc_compatibility_SRCS = doc/compatibility.xml \ EXTRA_DIST += $(doc_compatibility_SRCS) \ $(doc_configuration_SRCS) \ + $(doc_old_doc) \ doc/beautify.xsl CLEANFILES += $(doc_gen_DOCS) doc/*.raw.html* diff --git a/util-vserver/ensc_vector/Makefile-files b/util-vserver/ensc_vector/Makefile-files index 8e9b0e1..6e96cae 100644 --- a/util-vserver/ensc_vector/Makefile-files +++ b/util-vserver/ensc_vector/Makefile-files @@ -29,7 +29,7 @@ ENSC_VECTOR_SRCS = ensc_vector/vector-clear.c \ ENSC_VECTOR_HDRS = ensc_vector/vector.h \ ensc_vector/vector.hc -ENSC_VECTOR_XHDRS = ensc_vector/vector-resizeinternal.hc \ +noinst_HEADERS += ensc_vector/vector-resizeinternal.hc \ ensc_vector/vector-internal.h ENSC_VECTOR_LIBS = libensc_vector.a diff --git a/util-vserver/ensc_vector/testsuite/Makefile-files b/util-vserver/ensc_vector/testsuite/Makefile-files index c47c7df..523d40a 100644 --- a/util-vserver/ensc_vector/testsuite/Makefile-files +++ b/util-vserver/ensc_vector/testsuite/Makefile-files @@ -15,8 +15,8 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -ENSC_VECTOR_TESTSUITE_PRGS = ensc_vector/testsuite/test1 -ENSC_VECTOR_TESTSUITE_TSTS = ensc_vector/testsuite/test1 +check_PROGRAMS += ensc_vector/testsuite/test1 +TESTS += ensc_vector/testsuite/test1 ensc_vector_testsuite_test1_SOURCES = ensc_vector/testsuite/test1.c ensc_vector_testsuite_test1_LDADD = libensc_vector.a diff --git a/util-vserver/ensc_wrappers/Makefile-files b/util-vserver/ensc_wrappers/Makefile-files index 15349fa..b92da7f 100644 --- a/util-vserver/ensc_wrappers/Makefile-files +++ b/util-vserver/ensc_wrappers/Makefile-files @@ -15,7 +15,7 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -ENSC_WRAPPERS_HDRS = ensc_wrappers/wrappers-clone.hc \ +noinst_HEADERS += ensc_wrappers/wrappers-clone.hc \ ensc_wrappers/wrappers-dirent.hc \ ensc_wrappers/wrappers-fcntl.hc \ ensc_wrappers/wrappers-io.hc \ diff --git a/util-vserver/lib/Makefile-files b/util-vserver/lib/Makefile-files index 4d63683..275f452 100644 --- a/util-vserver/lib/Makefile-files +++ b/util-vserver/lib/Makefile-files @@ -105,9 +105,9 @@ lib_SRCS = lib/syscall.c \ $(lib_v11_SRCS) \ $(lib_v13_SRCS) -lib_HDRS = lib/vserver.h +include_HEADERS += lib/vserver.h -lib_XHDRS = lib/syscall-compat.hc \ +noinst_HEADERS += lib/syscall-compat.hc \ lib/syscall-legacy.hc \ lib/createskeleton-full.hc \ lib/createskeleton-short.hc \ @@ -131,16 +131,15 @@ lib_XHDRS = lib/syscall-compat.hc \ lib/utils-legacy.h \ lib/vserver-internal.h -lib_lib_LTLIBS = lib/libvserver.la +lib_LTLIBRARIES += lib/libvserver.la lib_libvserver_la_SOURCES = $(lib_SRCS) lib_libvserver_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIB_DEBUG_CPPFLAGS) -D_REENTRANT -D_GNU_SOURCE lib_libvserver_la_LDFLAGS = -version $(lib_VERSION) -lib_DIETPROGS = lib/lib_libvserver_la-% \ +DIETPROGS += lib/lib_libvserver_la-% \ lib/lib_libvserver_a-% \ - lib/lib_libvserver_pic_a-% \ - $(lib_testsuite_DIETPROGS) + lib/lib_libvserver_pic_a-% include $(srcdir)/lib/apidoc/Makefile-files include $(srcdir)/lib/testsuite/Makefile-files diff --git a/util-vserver/lib/testsuite/Makefile-files b/util-vserver/lib/testsuite/Makefile-files index 9cc3a1f..b99e046 100644 --- a/util-vserver/lib/testsuite/Makefile-files +++ b/util-vserver/lib/testsuite/Makefile-files @@ -15,13 +15,13 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -lib_testsuite_DIETPROGS = lib/testsuite/flags \ +DIETPROGS += lib/testsuite/flags \ lib/testsuite/fmt -lib_testsuite_PRGS = lib/testsuite/flags \ +check_PROGRAMS += lib/testsuite/flags \ lib/testsuite/fmt \ lib/testsuite/parselimit -lib_testsuite_TSTS = lib/testsuite/flags \ +TESTS += lib/testsuite/flags \ lib/testsuite/fmt \ lib/testsuite/parselimit diff --git a/util-vserver/lib_internal/Makefile-files b/util-vserver/lib_internal/Makefile-files index 8d12f67..f5bea2e 100644 --- a/util-vserver/lib_internal/Makefile-files +++ b/util-vserver/lib_internal/Makefile-files @@ -17,9 +17,8 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## -lib_internal_LIBS = lib_internal/libinternal.a - -lib_internal_libinternal_a_XHDRS = lib_internal/matchlist.h \ +noinst_LIBRARIES += lib_internal/libinternal.a +noinst_HEADERS += lib_internal/matchlist.h \ lib_internal/pathinfo.h \ lib_internal/string.h \ lib_internal/unify.h \ @@ -55,4 +54,4 @@ lib_internal_libinternal_a_SOURCES = lib_internal/matchlist-appendfiles.c \ lib_internal/util-exitlikeprocess.c \ lib_internal/util-safechdir.c -lib_internal_DIETPROGS = $(lib_internal_LIBS) +DIETPROGS += lib_internal/libinternal.a diff --git a/util-vserver/man/Makefile-files b/util-vserver/man/Makefile-files index c7054ed..d2216d3 100644 --- a/util-vserver/man/Makefile-files +++ b/util-vserver/man/Makefile-files @@ -17,7 +17,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## -man_DATMAN = man/chbind.8 \ +man_pages = man/chbind.8 \ man/chcontext.8 \ man/distrib-info.8 \ man/rebootmgr.8 \ @@ -28,3 +28,6 @@ man_DATMAN = man/chbind.8 \ man/vserver-stat.8 \ man/vserver.8 \ man/vtop.8 + +man_MANS += $(man_pages) +EXTRA_DIST += $(man_pages) diff --git a/util-vserver/scripts/Makefile-files b/util-vserver/scripts/Makefile-files index 7adc2e0..9720325 100644 --- a/util-vserver/scripts/Makefile-files +++ b/util-vserver/scripts/Makefile-files @@ -17,7 +17,8 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## -scripts_OPTIONS_EXEMPT = scripts/vapt-get-worker \ +AM_INSTALLCHECK_STD_OPTIONS_EXEMPT += \ + scripts/vapt-get-worker \ scripts/vrpm-worker \ scripts/vrpm-preload \ scripts/save_s_context \ @@ -80,18 +81,18 @@ scripts_subst_SRCS = scripts/util-vserver-vars.pathsubst \ -scripts_sbin_PRGS = $(scripts_sbin_src_PRGS) $(scripts_sbin_gen_PRGS) +sbin_SCRIPTS += $(scripts_sbin_src_PRGS) $(scripts_sbin_gen_PRGS) scripts_sbincfg_DTA = $(scripts_sbincfg_gen_DTA) -scripts_pkglib_SCRPTS = $(scripts_pkglib_src_SCRPTS) -scripts_legacy_SCRPTS = $(scripts_legacy_src_SCRPTS) $(scripts_legacy_gen_SCRPTS) -scripts_pkglib_DTA = $(scripts_pkglib_src_DTA) $(scripts_pkglib_gen_DTA) +pkglib_SCRIPTS += $(scripts_pkglib_src_SCRPTS) +legacy_SCRIPTS += $(scripts_legacy_src_SCRPTS) $(scripts_legacy_gen_SCRPTS) +pkglib_DATA += $(scripts_pkglib_src_DTA) $(scripts_pkglib_gen_DTA) -scripts_CLEANFILES = $(scripts_pkglib_gen_DTA) \ +CLEANFILES += $(scripts_pkglib_gen_DTA) \ $(scripts_sbin_gen_PRGS) \ $(scripts_sbincfg_gen_DTA) \ $(scripts_legacy_gen_SCRPTS) -scripts_XTRAS = $(scripts_pkglib_src_DTA) \ +EXTRA_DIST += $(scripts_pkglib_src_DTA) \ $(scripts_pkglib_src_SCRPTS) \ $(scripts_legacy_src_SCRPTS) \ $(scripts_sbin_src_PRGS) \ diff --git a/util-vserver/src/Makefile-files b/util-vserver/src/Makefile-files index b95c5ae..6926da4 100644 --- a/util-vserver/src/Makefile-files +++ b/util-vserver/src/Makefile-files @@ -23,28 +23,27 @@ src_pkglib_CXX_PROGS = src/vbuild src/vcheck src_pkglib_C99_PROGS = src/vunify src/vcopy -src_OPTIONS_EXEMPT = src/parserpmdump \ - src/readlink \ - src/showperm \ - src/vbuild \ - src/vcheck \ - src/vreboot \ - src/save_ctxinfo \ - src/mask2prefix \ - src/pipe-sync \ - src/capchroot \ - src/chroot-cat \ - src/filetime \ - src/ifspec \ - src/rebootmgr \ - src/vlimit \ - src/vdu \ - src/vfiles \ - src/vserver-stat - - - -src_DIETPROGS = src/chcontext-compat \ +AM_INSTALLCHECK_STD_OPTIONS_EXEMPT += \ + src/parserpmdump \ + src/readlink \ + src/showperm \ + src/vbuild \ + src/vcheck \ + src/vreboot \ + src/save_ctxinfo \ + src/mask2prefix \ + src/pipe-sync \ + src/capchroot \ + src/chroot-cat \ + src/filetime \ + src/ifspec \ + src/rebootmgr \ + src/vdu \ + src/vfiles + + + +DIETPROGS += src/chcontext-compat \ src/secure-mount \ src/save_ctxinfo \ src/mask2prefix \ @@ -77,7 +76,7 @@ src_DIETPROGS = src/chcontext-compat \ src/vserver-stat \ src/vserver-info -src_HDRS = src/vutil.h src/vutil.p \ +noinst_HEADERS += src/vutil.h src/vutil.p \ src/util.h \ src/fstool.h \ src/compat-pivot_root.h \ @@ -89,11 +88,7 @@ src_HDRS = src/vutil.h src/vutil.p \ src/vserver-visitdir.hc \ src/vserver.hh -src_legacy_SCRPTS = -src_legacy_PRGS = - -src_pkglib_SCRPTS = -src_pkglib_PRGS = src/capchroot \ +pkglib_PROGRAMS += src/capchroot \ src/chcontext-compat \ src/chroot-cat \ src/chroot-rm \ @@ -116,11 +111,9 @@ src_pkglib_PRGS = src/capchroot \ $(src_pkglib_C99_X_PROGS) \ $(src_pkglib_CXX_X_PROGS) -src_pkglib_LTLIBS = src/rpm-fake.la -src_lib_LTLIBS = +pkglib_LTLIBRARIES += src/rpm-fake.la -src_sbin_SCRPTS = -src_sbin_PRGS = src/chbind \ +sbin_PROGRAMS += src/chbind \ src/exec-cd \ src/lsxid \ src/chxid \ @@ -265,14 +258,9 @@ src_rpm_fake_la_CFLAGS = $(AM_CFLAGS) src_rpm_fake_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir) src_rpm_fake_la_LIBADD = lib/libvserver.la -ldl -src_check_PRGS = $(src_testsuite_check_PRGS) -src_check_SCRPTS = $(src_testsuite_check_SCRPTS) -src_TSTS = $(src_testsuite_TSTS) -src_XTRAS = $(src_testsuite_XTRAS) - -src_EXTRA_PROGS = $(src_sbin_CXX_PROGS) $(src_pkglib_CXX_PROGS) +EXTRA_PROGRAMS += $(src_sbin_CXX_PROGS) $(src_pkglib_CXX_PROGS) -src_TESTS_ENV = srctestsuitedir=$(top_builddir)/src/testsuite +TESTS_ENVIRONMENT += srctestsuitedir=$(top_builddir)/src/testsuite if ENSC_HAVE_C99_COMPILER src_sbin_C99_X_PROGS = $(src_sbin_C99_PROGS) diff --git a/util-vserver/src/testsuite/Makefile-files b/util-vserver/src/testsuite/Makefile-files index d61a6a6..453510d 100644 --- a/util-vserver/src/testsuite/Makefile-files +++ b/util-vserver/src/testsuite/Makefile-files @@ -21,7 +21,7 @@ src_testsuite_check_active_PRGS = src/testsuite/vunify-functest \ src_testsuite_check_passive_PRGS = src/testsuite/rpm-fake-test -src_testsuite_check_PRGS = $(src_testsuite_check_passive_PRGS) \ +check_PROGRAMS += $(src_testsuite_check_passive_PRGS) \ $(src_testsuite_check_active_PRGS) if ENSC_HAVE_C99_COMPILER @@ -33,13 +33,14 @@ endif src_testsuite_check_src_SCRPTS = $(src_testsuite_check_src_C99_SCRPTS) src_testsuite_check_gen_SCRPTS = -src_testsuite_check_SCRPTS = $(src_testsuite_check_src_SCRPTS) \ +check_SCRIPTS += $(src_testsuite_check_src_SCRPTS) \ $(src_testsuite_check_gen_SCRPTS) -src_testsuite_TSTS = $(src_testsuite_check_active_PRGS) \ - $(src_testsuite_check_SCRPTS) +TESTS += $(src_testsuite_check_active_PRGS) \ + $(src_testsuite_check_src_SCRPTS) \ + $(src_testsuite_check_gen_SCRPTS) -src_testsuite_XTRAS = $(src_testsuite_check_src_SCRPTS) +EXTRA_DIST += $(src_testsuite_check_src_SCRPTS) src_testsuite_rpm_fake_test_SOURCES = src/testsuite/rpm-fake-test.c diff --git a/util-vserver/tests/Makefile-files b/util-vserver/tests/Makefile-files index 6bf9b1d..ea5399f 100644 --- a/util-vserver/tests/Makefile-files +++ b/util-vserver/tests/Makefile-files @@ -17,15 +17,19 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## -tests_DIETPROGS = tests/getctx tests/getinitpid \ - tests/vserver-info - -test_PRGS = tests/escaperoot \ - tests/forkbomb \ - tests/testipc \ - tests/testlimit \ - tests/testopenf \ - $(tests_DIETPROGS) +tests_dietprogs = tests/getctx \ + tests/getinitpid \ + tests/vserver-info + +noinst_PROGRAMS += tests/escaperoot \ + tests/forkbomb \ + tests/testipc \ + tests/testlimit \ + tests/testopenf \ + $(tests_dietprogs) + + +DIETPROGS += $(tests_dietprogs) tests_escaperoot_SOURCES = tests/escaperoot.c tests_forkbomb_SOURCES = tests/forkbomb.c