From 5585e756f36d0db361a98a147ec177a5f1f15fbd Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Thu, 27 Aug 2015 00:08:19 +0200 Subject: [PATCH] Add test cases for the dependency fix --- tests/library/Makefile.Darwin | 4 ++-- tests/library/Makefile.Linux | 4 ++-- tests/library/Makefile.NetBSD | 4 ++-- tests/library/Makefile.Windows | 2 +- tests/library/project.conf | 1 + tests/object/Makefile.NetBSD | 2 +- tests/object/project.conf | 3 +++ tests/plugin/Makefile.Darwin | 2 +- tests/plugin/Makefile.NetBSD | 2 +- tests/plugin/project.conf | 1 + tests/script/Makefile.NetBSD | 2 +- tests/script/project.conf | 1 + 12 files changed, 17 insertions(+), 11 deletions(-) diff --git a/tests/library/Makefile.Darwin b/tests/library/Makefile.Darwin index 7f623be..dd622b4 100644 --- a/tests/library/Makefile.Darwin +++ b/tests/library/Makefile.Darwin @@ -19,11 +19,11 @@ libtest_OBJS = $(OBJDIR)test.o libtest_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) libtest_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -$(OBJDIR)libtest.a: $(libtest_OBJS) +$(OBJDIR)libtest.a: $(libtest_OBJS) a.c b.c $(AR) -rc $(OBJDIR)libtest.a $(libtest_OBJS) $(RANLIB) $(OBJDIR)libtest.a -$(OBJDIR)libtest.0.0.dylib: $(libtest_OBJS) +$(OBJDIR)libtest.0.0.dylib: $(libtest_OBJS) a.c b.c $(CCSHARED) -o $(OBJDIR)libtest.0.0.dylib -install_name $(LIBDIR)/libtest.0.dylib $(libtest_OBJS) $(libtest_LDFLAGS) $(OBJDIR)libtest.0.dylib: $(OBJDIR)libtest.0.0.dylib diff --git a/tests/library/Makefile.Linux b/tests/library/Makefile.Linux index b41e498..30cda5a 100644 --- a/tests/library/Makefile.Linux +++ b/tests/library/Makefile.Linux @@ -19,11 +19,11 @@ libtest_OBJS = $(OBJDIR)test.o libtest_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) libtest_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -$(OBJDIR)libtest.a: $(libtest_OBJS) +$(OBJDIR)libtest.a: $(libtest_OBJS) a.c b.c $(AR) -rc $(OBJDIR)libtest.a $(libtest_OBJS) $(RANLIB) $(OBJDIR)libtest.a -$(OBJDIR)libtest.so.0.0: $(libtest_OBJS) +$(OBJDIR)libtest.so.0.0: $(libtest_OBJS) a.c b.c $(CCSHARED) -o $(OBJDIR)libtest.so.0.0 -Wl,-soname,libtest.so.0 $(libtest_OBJS) $(libtest_LDFLAGS) $(OBJDIR)libtest.so.0: $(OBJDIR)libtest.so.0.0 diff --git a/tests/library/Makefile.NetBSD b/tests/library/Makefile.NetBSD index fdcffc7..27998c0 100644 --- a/tests/library/Makefile.NetBSD +++ b/tests/library/Makefile.NetBSD @@ -19,11 +19,11 @@ libtest_OBJS = $(OBJDIR)test.o libtest_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) libtest_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -$(OBJDIR)libtest.a: $(libtest_OBJS) +$(OBJDIR)libtest.a: $(libtest_OBJS) a.c b.c $(AR) -rc $(OBJDIR)libtest.a $(libtest_OBJS) $(RANLIB) $(OBJDIR)libtest.a -$(OBJDIR)libtest.so.0.0: $(libtest_OBJS) +$(OBJDIR)libtest.so.0.0: $(libtest_OBJS) a.c b.c $(CCSHARED) -o $(OBJDIR)libtest.so.0.0 -Wl,-soname,libtest.so.0 $(libtest_OBJS) $(libtest_LDFLAGS) $(OBJDIR)libtest.so.0: $(OBJDIR)libtest.so.0.0 diff --git a/tests/library/Makefile.Windows b/tests/library/Makefile.Windows index e883f36..8c3edcc 100644 --- a/tests/library/Makefile.Windows +++ b/tests/library/Makefile.Windows @@ -18,7 +18,7 @@ libtest_OBJS = $(OBJDIR)test.o libtest_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) libtest_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -$(OBJDIR)libtest.dll: $(libtest_OBJS) +$(OBJDIR)libtest.dll: $(libtest_OBJS) a.c b.c $(CCSHARED) -o $(OBJDIR)libtest.dll $(libtest_OBJS) $(libtest_LDFLAGS) $(OBJDIR)test.o: test.c diff --git a/tests/library/project.conf b/tests/library/project.conf index e46d4ed..56291a8 100644 --- a/tests/library/project.conf +++ b/tests/library/project.conf @@ -5,4 +5,5 @@ dist=Makefile [libtest] type=library sources=test.c +depends=a.c,b.c install=$(LIBDIR) diff --git a/tests/object/Makefile.NetBSD b/tests/object/Makefile.NetBSD index 8d479a1..6c8a2cf 100644 --- a/tests/object/Makefile.NetBSD +++ b/tests/object/Makefile.NetBSD @@ -15,7 +15,7 @@ all: $(TARGETS) object.o_OBJS = $(OBJDIR)object.o object.o_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) -$(OBJDIR)object.o: object.c +$(OBJDIR)object.o: object.c a.c b.c $(CC) $(object.o_CFLAGS) -o $(OBJDIR)object.o -c object.c clean: diff --git a/tests/object/project.conf b/tests/object/project.conf index 07dc018..f6a6a95 100644 --- a/tests/object/project.conf +++ b/tests/object/project.conf @@ -5,3 +5,6 @@ dist=Makefile type=object sources=object.c install=$(LIBDIR) + +[object.c] +depends=a.c,b.c diff --git a/tests/plugin/Makefile.Darwin b/tests/plugin/Makefile.Darwin index 211ae1b..a9e53f2 100644 --- a/tests/plugin/Makefile.Darwin +++ b/tests/plugin/Makefile.Darwin @@ -18,7 +18,7 @@ test_OBJS = $(OBJDIR)test.o test_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) test_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -$(OBJDIR)test.dylib: $(test_OBJS) +$(OBJDIR)test.dylib: $(test_OBJS) a.c b.c $(CCSHARED) -o $(OBJDIR)test.dylib $(test_OBJS) $(test_LDFLAGS) $(OBJDIR)test.o: test.c diff --git a/tests/plugin/Makefile.NetBSD b/tests/plugin/Makefile.NetBSD index b6f4dc5..d2b6f3c 100644 --- a/tests/plugin/Makefile.NetBSD +++ b/tests/plugin/Makefile.NetBSD @@ -18,7 +18,7 @@ test_OBJS = $(OBJDIR)test.o test_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) test_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -$(OBJDIR)test.so: $(test_OBJS) +$(OBJDIR)test.so: $(test_OBJS) a.c b.c $(CCSHARED) -o $(OBJDIR)test.so $(test_OBJS) $(test_LDFLAGS) $(OBJDIR)test.o: test.c diff --git a/tests/plugin/project.conf b/tests/plugin/project.conf index ee7e93e..5fc64ca 100644 --- a/tests/plugin/project.conf +++ b/tests/plugin/project.conf @@ -4,4 +4,5 @@ dist=Makefile [test] type=plugin sources=test.c +depends=a.c,b.c install=$(LIBDIR)/configure diff --git a/tests/script/Makefile.NetBSD b/tests/script/Makefile.NetBSD index 0d105d4..44bf9fe 100644 --- a/tests/script/Makefile.NetBSD +++ b/tests/script/Makefile.NetBSD @@ -13,7 +13,7 @@ all: $(TARGETS) $(OBJDIR)test: ./script.sh -P "/somewhere/else" -- "$(OBJDIR)test" -phony: +phony: a.c b.c ./script.sh -P "$(PREFIX)" -- "phony" clean: diff --git a/tests/script/project.conf b/tests/script/project.conf index 1311050..647a8a1 100644 --- a/tests/script/project.conf +++ b/tests/script/project.conf @@ -10,5 +10,6 @@ install=/somewhere/else/again [phony] type=script script=./script.sh +depends=a.c,b.c phony=1 install=