From 8091f2466f2a3b7402c1f7c67daabf15d6e52d69 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 29 Jul 2010 20:56:02 +0000 Subject: 2010-07-29 Joel Sherrill * tar01/Makefile.am, tar02/Makefile.am: Fix dependencies for parallel build. --- testsuites/libtests/ChangeLog | 5 +++++ testsuites/libtests/tar01/Makefile.am | 11 +++++++---- testsuites/libtests/tar02/Makefile.am | 9 ++++++--- 3 files changed, 18 insertions(+), 7 deletions(-) (limited to 'testsuites') diff --git a/testsuites/libtests/ChangeLog b/testsuites/libtests/ChangeLog index 9ee0189f4a..9ca57b32dc 100644 --- a/testsuites/libtests/ChangeLog +++ b/testsuites/libtests/ChangeLog @@ -1,3 +1,8 @@ +2010-07-29 Joel Sherrill + + * tar01/Makefile.am, tar02/Makefile.am: Fix dependencies for parallel + build. + 2010-07-29 Ralf Corsépius * tar01/Makefile.am, tar02/Makefile.am: Replace mkdir cascade diff --git a/testsuites/libtests/tar01/Makefile.am b/testsuites/libtests/tar01/Makefile.am index b959ca3a53..50854fe9ca 100644 --- a/testsuites/libtests/tar01/Makefile.am +++ b/testsuites/libtests/tar01/Makefile.am @@ -23,11 +23,13 @@ tar01$(EXEEXT): $(tar01_OBJECTS) $(tar01_DEPENDENCIES) @rm -f tar01$(EXEEXT) $(make-exe) +init.o: init.c initial_filesystem_tar.h + initial_filesystem_tar.c: stamp-initial-fs-source initial_filesystem_tar.h: stamp-initial-fs-source -stamp-initial-fs-source: initial_filesystem.tar +stamp-initial-fs-source: stamp-fs-tar $(BIN2C) initial_filesystem.tar initial_filesystem_tar touch stamp-initial-fs-source @@ -39,10 +41,11 @@ stamp-filesystem: cd initial_fs && ln -s home/test_file symlink touch stamp-filesystem -initial_filesystem.tar: stamp-filesystem +stamp-fs-tar: stamp-filesystem cd initial_fs ; pax -w -f ../initial_filesystem.tar home symlink + touch stamp-fs-tar -CLEANFILES = initial_fs initial_filesystem* stamp-filesystem \ - stamp-initial-fs-source +CLEANFILES = initial_filesystem* stamp-filesystem \ + stamp-fs-tar stamp-initial-fs-source include $(top_srcdir)/../automake/local.am diff --git a/testsuites/libtests/tar02/Makefile.am b/testsuites/libtests/tar02/Makefile.am index dca8d00cbd..7ccbed3782 100644 --- a/testsuites/libtests/tar02/Makefile.am +++ b/testsuites/libtests/tar02/Makefile.am @@ -23,11 +23,13 @@ tar02$(EXEEXT): $(tar02_OBJECTS) $(tar02_DEPENDENCIES) @rm -f tar02$(EXEEXT) $(make-exe) +init.o: init.c initial_filesystem_tar.h + initial_filesystem_tar.c: stamp-initial-fs-source initial_filesystem_tar.h: stamp-initial-fs-source -stamp-initial-fs-source: initial_filesystem.tar +stamp-initial-fs-source: stamp-fs-tar $(BIN2C) initial_filesystem.tar initial_filesystem_tar touch stamp-initial-fs-source @@ -39,10 +41,11 @@ stamp-filesystem: cd initial_fs && ln -s home/test_file symlink touch stamp-filesystem -initial_filesystem.tar: stamp-filesystem +stamp-fs-tar: stamp-filesystem cd initial_fs ; pax -w -f ../initial_filesystem.tar home symlink + touch stamp-fs-tar CLEANFILES = initial_filesystem* stamp-filesystem \ - stamp-initial-fs-source + stamp-fs-tar stamp-initial-fs-source include $(top_srcdir)/../automake/local.am -- cgit v1.2.3