diff options
Diffstat (limited to 'testsuites/libtests')
-rw-r--r-- | testsuites/libtests/ChangeLog | 6 | ||||
-rw-r--r-- | testsuites/libtests/tar01/Makefile.am | 24 | ||||
-rw-r--r-- | testsuites/libtests/tar02/Makefile.am | 24 |
3 files changed, 29 insertions, 25 deletions
diff --git a/testsuites/libtests/ChangeLog b/testsuites/libtests/ChangeLog index 9ca57b32dc..8230ffac45 100644 --- a/testsuites/libtests/ChangeLog +++ b/testsuites/libtests/ChangeLog @@ -1,3 +1,9 @@ +2010-07-29 Ralf Corsépius <ralf.corsepius@rtems.org> + + * tar01/Makefile.am, tar02/Makefile.am: + Eliminate stamp-fs-tar. Reorder CLEANFILES. + Apply BIN2C -C/-H. + 2010-07-29 Joel Sherrill <joel.sherrilL@OARcorp.com> * tar01/Makefile.am, tar02/Makefile.am: Fix dependencies for parallel diff --git a/testsuites/libtests/tar01/Makefile.am b/testsuites/libtests/tar01/Makefile.am index 50854fe9ca..0b8eab6401 100644 --- a/testsuites/libtests/tar01/Makefile.am +++ b/testsuites/libtests/tar01/Makefile.am @@ -2,6 +2,8 @@ ## $Id$ ## +CLEANFILES = + rtems_tests_PROGRAMS = tar01 tar01_SOURCES = init.c ../../psxtests/psxfile01/test_cat.c \ initial_filesystem_tar.c initial_filesystem_tar.h @@ -23,15 +25,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 +initial_filesystem_tar.c: initial_filesystem.tar + $(BIN2C) -C initial_filesystem.tar initial_filesystem_tar +CLEANFILES += initial_filesystem_tar.c -stamp-initial-fs-source: stamp-fs-tar - $(BIN2C) initial_filesystem.tar initial_filesystem_tar - touch stamp-initial-fs-source +initial_filesystem_tar.h: initial_filesystem.tar + $(BIN2C) -H initial_filesystem.tar initial_filesystem_tar +CLEANFILES += initial_filesystem_tar.h stamp-filesystem: rm -rf initial_fs @@ -40,12 +40,12 @@ stamp-filesystem: echo "initial tar image.") >initial_fs/home/test_file cd initial_fs && ln -s home/test_file symlink touch stamp-filesystem +CLEANFILES += stamp-filesystem -stamp-fs-tar: stamp-filesystem +initial_filesystem.tar: stamp-filesystem cd initial_fs ; pax -w -f ../initial_filesystem.tar home symlink - touch stamp-fs-tar +CLEANFILES += initial_filesystem.tar -CLEANFILES = initial_filesystem* stamp-filesystem \ - stamp-fs-tar stamp-initial-fs-source +CLEANFILES += initial_fs include $(top_srcdir)/../automake/local.am diff --git a/testsuites/libtests/tar02/Makefile.am b/testsuites/libtests/tar02/Makefile.am index 7ccbed3782..5d606a5281 100644 --- a/testsuites/libtests/tar02/Makefile.am +++ b/testsuites/libtests/tar02/Makefile.am @@ -2,6 +2,8 @@ ## $Id$ ## +CLEANFILES = + rtems_tests_PROGRAMS = tar02 tar02_SOURCES = init.c ../../psxtests/psxfile01/test_cat.c \ initial_filesystem_tar.c initial_filesystem_tar.h @@ -23,15 +25,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.c: initial_filesystem.tar + $(BIN2C) -C initial_filesystem.tar initial_filesystem_tar +CLEANFILES += initial_filesystem_tar.c -initial_filesystem_tar.h: stamp-initial-fs-source - -stamp-initial-fs-source: stamp-fs-tar - $(BIN2C) initial_filesystem.tar initial_filesystem_tar - touch stamp-initial-fs-source +initial_filesystem_tar.h: initial_filesystem.tar + $(BIN2C) -H initial_filesystem.tar initial_filesystem_tar +CLEANFILES += initial_filesystem_tar.h stamp-filesystem: rm -rf initial_fs @@ -40,12 +40,10 @@ stamp-filesystem: echo "initial tar image.") >initial_fs/home/test_file cd initial_fs && ln -s home/test_file symlink touch stamp-filesystem +CLEANFILES += stamp-filesystem -stamp-fs-tar: stamp-filesystem +initial_filesystem.tar: stamp-filesystem cd initial_fs ; pax -w -f ../initial_filesystem.tar home symlink - touch stamp-fs-tar - -CLEANFILES = initial_filesystem* stamp-filesystem \ - stamp-fs-tar stamp-initial-fs-source +CLEANFILES += initial_filesystem.tar include $(top_srcdir)/../automake/local.am |