From d80ed481022688fbf0658d5a612b05f5286f00de Mon Sep 17 00:00:00 2001 From: Thomas Jensen Date: Mon, 1 May 2023 21:41:02 +0200 Subject: [PATCH] Fix declared header dependencies in Makefiles --- src/Makefile | 20 ++++++++++---------- src/boxes.c | 1 + utest/Makefile | 14 +++++++------- utest/cmdline_test.c | 2 ++ utest/global_mock.c | 5 +++++ utest/regulex_test.c | 1 + 6 files changed, 26 insertions(+), 17 deletions(-) diff --git a/src/Makefile b/src/Makefile index e3d957d..2a20447 100644 --- a/src/Makefile +++ b/src/Makefile @@ -107,23 +107,23 @@ parser.c parser.h: parser.y lex.yy.h | check_dir lex.yy.c lex.yy.h: lexer.l | check_dir $(LEX) --header-file=lex.yy.h $< -boxes.o: boxes.c boxes.h cmdline.h discovery.h generate.h input.h list.h remove.h tools.h unicode.h config.h | check_dir +boxes.o: boxes.c boxes.h cmdline.h discovery.h generate.h input.h list.h parsing.h query.h remove.h tools.h unicode.h config.h | check_dir bxstring.o: bxstring.c bxstring.h tools.h unicode.h config.h | check_dir -cmdline.o: cmdline.c cmdline.h boxes.h tools.h config.h | check_dir -discovery.o: discovery.c discovery.h boxes.h tools.h config.h | check_dir +cmdline.o: cmdline.c cmdline.h boxes.h discovery.h query.h tools.h config.h | check_dir +discovery.o: discovery.c discovery.h boxes.h tools.h unicode.h config.h | check_dir generate.o: generate.c generate.h boxes.h shape.h tools.h unicode.h config.h | check_dir getopt.o: misc/getopt.c misc/getopt.h | check_dir input.o: input.c boxes.h input.h regulex.h tools.h unicode.h config.h | check_dir -lex.yy.o: lex.yy.c parser.h boxes.h parsing.h tools.h shape.h config.h | check_dir -list.o: list.c list.h boxes.h parsing.h query.h tools.h config.h | check_dir -parsecode.o: parsecode.c parser.h boxes.h tools.h lex.yy.h query.h regulex.h unicode.h config.h | check_dir -parser.o: parser.c boxes.h lex.yy.h parser.h parsing.h tools.h shape.h discovery.h config.h | check_dir -parsing.o: parsing.c parsing.h parser.h lex.yy.h boxes.h tools.h config.h | check_dir +lex.yy.o: lex.yy.c parser.h boxes.h parsing.h tools.h shape.h unicode.h config.h | check_dir +list.o: list.c list.h boxes.h bxstring.h parsing.h query.h tools.h unicode.h config.h | check_dir +parsecode.o: parsecode.c parsecode.h discovery.h lex.yy.h parsing.h parser.h query.h regulex.h tools.h unicode.h config.h | check_dir +parser.o: parser.c boxes.h bxstring.h lex.yy.h parsecode.h parser.h parsing.h shape.h tools.h unicode.h config.h | check_dir +parsing.o: parsing.c parsing.h bxstring.h parser.h lex.yy.h boxes.h tools.h config.h | check_dir query.o: query.c query.h boxes.h list.h tools.h config.h | check_dir regulex.o: regulex.c regulex.h boxes.h tools.h unicode.h config.h | check_dir remove.o: remove.c remove.h boxes.h shape.h tools.h unicode.h config.h | check_dir -shape.o: shape.c shape.h boxes.h tools.h config.h | check_dir -tools.o: tools.c tools.h boxes.h shape.h unicode.h config.h | check_dir +shape.o: shape.c shape.h boxes.h bxstring.h tools.h config.h | check_dir +tools.o: tools.c tools.h boxes.h regulex.h shape.h unicode.h config.h | check_dir unicode.o: unicode.c unicode.h boxes.h tools.h config.h | check_dir diff --git a/src/boxes.c b/src/boxes.c index 71cd61f..1f8d8cb 100644 --- a/src/boxes.c +++ b/src/boxes.c @@ -14,6 +14,7 @@ */ #include "config.h" + #include #include #include diff --git a/utest/Makefile b/utest/Makefile index 0dcd3c3..088ab0b 100644 --- a/utest/Makefile +++ b/utest/Makefile @@ -67,11 +67,11 @@ unittest.exe: $(UTEST_OBJ) | check_dir -lkernel32 -l:libunistring.a -l:libpcre2-32.a -l:libiconv.a -l:libcmocka.dll.a -global_mock.o: global_mock.c global_mock.h boxes.h unicode.h config.h | check_dir -bxstring_test.o: bxstring_test.c bxstring_test.h global_mock.h bxstring.h config.h | check_dir -cmdline_test.o: cmdline_test.c cmdline_test.h global_mock.h boxes.h cmdline.h config.h | check_dir -tools_test.o: tools_test.c tools_test.h tools.h config.h | check_dir -regulex_test.o: regulex_test.c regulex_test.h global_mock.h regulex.h config.h | check_dir -main.o: main.c global_mock.h tools_test.h regulex_test.h config.h | check_dir -unicode_test.o: unicode_test.c unicode_test.h global_mock.h config.h | check_dir +global_mock.o: global_mock.c global_mock.h boxes.h unicode.h tools.h config.h | check_dir +bxstring_test.o: bxstring_test.c bxstring_test.h boxes.h bxstring.h global_mock.h tools.h unicode.h utest_tools.h config.h | check_dir +cmdline_test.o: cmdline_test.c cmdline_test.h boxes.h cmdline.h global_mock.h tools.h config.h | check_dir +tools_test.o: tools_test.c tools_test.h tools.h unicode.h config.h | check_dir +regulex_test.o: regulex_test.c regulex_test.h boxes.h global_mock.h regulex.h config.h | check_dir +main.o: main.c bxstring_test.h cmdline_test.h global_mock.h tools_test.h regulex_test.h unicode_test.h config.h | check_dir +unicode_test.o: unicode_test.c unicode_test.h boxes.h unicode.h config.h | check_dir utest_tools.o: utest_tools.c utest_tools.h config.h | check_dir diff --git a/utest/cmdline_test.c b/utest/cmdline_test.c index edd3807..d44df30 100644 --- a/utest/cmdline_test.c +++ b/utest/cmdline_test.c @@ -18,10 +18,12 @@ */ #include "config.h" + #include #include #include #include + #include "boxes.h" #include "cmdline.h" #include "tools.h" diff --git a/utest/global_mock.c b/utest/global_mock.c index c2ec972..263f6b7 100644 --- a/utest/global_mock.c +++ b/utest/global_mock.c @@ -18,14 +18,19 @@ */ #include "config.h" + #include #include #include #include #include + #include "boxes.h" #include "unicode.h" #include "tools.h" +#include "global_mock.h" + + design_t *designs = NULL; diff --git a/utest/regulex_test.c b/utest/regulex_test.c index 7a64d04..87dfcb9 100644 --- a/utest/regulex_test.c +++ b/utest/regulex_test.c @@ -29,6 +29,7 @@ #include "boxes.h" #include "global_mock.h" #include "regulex.h" +#include "regulex_test.h"