From 4000836c03dfddf15d877bfa148138c7a8ce31b7 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 13 Jun 2017 13:01:03 +0200 Subject: tests: Fix build dependencies See also: https://www.gnu.org/software/automake/manual/html_node/Built-Sources-Example.html --- testsuites/libtests/dl01/Makefile.am | 2 +- testsuites/libtests/dl02/Makefile.am | 2 +- testsuites/libtests/dl04/Makefile.am | 2 +- testsuites/libtests/dl05/Makefile.am | 2 +- testsuites/libtests/mghttpd01/Makefile.am | 2 +- testsuites/libtests/tar01/Makefile.am | 7 ++++++- testsuites/libtests/tar02/Makefile.am | 2 +- 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/testsuites/libtests/dl01/Makefile.am b/testsuites/libtests/dl01/Makefile.am index 653e38505f..8c5d6912d5 100644 --- a/testsuites/libtests/dl01/Makefile.am +++ b/testsuites/libtests/dl01/Makefile.am @@ -14,7 +14,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../support/include LINK_OBJS = $(dl01_OBJECTS) LINK_LIBS = $(dl01_LDLIBS) -init.c: dl-tar.h +init.$(OBJEXT): dl-tar.h dl-o1.o: dl-o1.c diff --git a/testsuites/libtests/dl02/Makefile.am b/testsuites/libtests/dl02/Makefile.am index 12df8a0adf..aa848e4247 100644 --- a/testsuites/libtests/dl02/Makefile.am +++ b/testsuites/libtests/dl02/Makefile.am @@ -14,7 +14,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../support/include LINK_OBJS = $(dl02_OBJECTS) LINK_LIBS = $(dl02_LDLIBS) -init.c: dl-tar.h +init.$(OBJEXT): dl-tar.h dl-o1.o: dl-o1.c diff --git a/testsuites/libtests/dl04/Makefile.am b/testsuites/libtests/dl04/Makefile.am index 141dd5d500..7dbc5438e8 100644 --- a/testsuites/libtests/dl04/Makefile.am +++ b/testsuites/libtests/dl04/Makefile.am @@ -15,7 +15,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../support/include LINK_OBJS = $(dl04_OBJECTS) LINK_LIBS = $(dl04_LDLIBS) -init.c: dl-tar.h +init.$(OBJEXT): dl-tar.h dl-o4.o: dl-o4.cpp diff --git a/testsuites/libtests/dl05/Makefile.am b/testsuites/libtests/dl05/Makefile.am index 595d2748dd..8d2ddee638 100644 --- a/testsuites/libtests/dl05/Makefile.am +++ b/testsuites/libtests/dl05/Makefile.am @@ -14,7 +14,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../support/include LINK_OBJS = $(dl05_OBJECTS) LINK_LIBS = $(dl05_LDLIBS) -init.c: dl-tar.h +init.$(OBJEXT): dl-tar.h dl-o5.o: dl-o5.cpp diff --git a/testsuites/libtests/mghttpd01/Makefile.am b/testsuites/libtests/mghttpd01/Makefile.am index 2798d2a5fd..909a646970 100644 --- a/testsuites/libtests/mghttpd01/Makefile.am +++ b/testsuites/libtests/mghttpd01/Makefile.am @@ -20,7 +20,7 @@ mghttpd01$(EXEEXT): $(mghttpd01_OBJECTS) $(mghttpd01_DEPENDENCIES) @rm -f mghttpd01$(EXEEXT) $(make-exe) -init.c: init_fs.h +init.$(OBJEXT): init_fs.h init_fs.c: $(BIN2C) -C $(srcdir)/init_fs.tar init_fs diff --git a/testsuites/libtests/tar01/Makefile.am b/testsuites/libtests/tar01/Makefile.am index 201f1e83e1..a19b5dbabe 100644 --- a/testsuites/libtests/tar01/Makefile.am +++ b/testsuites/libtests/tar01/Makefile.am @@ -48,9 +48,14 @@ tar01$(EXEEXT): $(tar01_OBJECTS) $(tar01_DEPENDENCIES) @rm -f tar01$(EXEEXT) $(make-exe) -init.c: initial_filesystem_tar.h \ +if TARTEST_XZ +init.$(OBJEXT): initial_filesystem_tar.h \ initial_filesystem_tar_gz.h \ initial_filesystem_tar_xz.h +else +init.$(OBJEXT): initial_filesystem_tar.h \ + initial_filesystem_tar_gz.h +endif initial_filesystem_tar.c: initial_filesystem.tar $(BIN2C) -C initial_filesystem.tar initial_filesystem_tar diff --git a/testsuites/libtests/tar02/Makefile.am b/testsuites/libtests/tar02/Makefile.am index e83bfd2dd4..67a4136570 100644 --- a/testsuites/libtests/tar02/Makefile.am +++ b/testsuites/libtests/tar02/Makefile.am @@ -25,7 +25,7 @@ tar02$(EXEEXT): $(tar02_OBJECTS) $(tar02_DEPENDENCIES) @rm -f tar02$(EXEEXT) $(make-exe) -init.c: initial_filesystem_tar.h +init.$(OBJEXT): initial_filesystem_tar.h initial_filesystem_tar.c: initial_filesystem.tar $(BIN2C) -C initial_filesystem.tar initial_filesystem_tar -- cgit v1.2.3