From cd0ec0faa9b9645a3a66e0375be145ddd628a87e Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Sun, 5 Jun 2022 14:25:25 +0200 Subject: [PATCH] [Makefile] DRY --- Makefile.lib | 1 + src/cookies/Makefile | 3 --- src/document/html/test/Makefile | 3 --- src/protocol/ftp/Makefile | 2 -- src/protocol/test/Makefile | 1 - 5 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Makefile.lib b/Makefile.lib index 9b7ca3e8..08de63a3 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -202,6 +202,7 @@ test-default: ifdef TEST_PROGS TESTDEPS-$(CONFIG_DEBUG) += $(top_builddir)/src/util/memdebug.o +TESTDEPS-$(CONFIG_UTF8) += $(top_builddir)/src/intl/width.o TESTDEPS-unless$(CONFIG_SMALL) += $(top_builddir)/src/util/fastfind.o # Add most of the basic utility library to the test dependencies. diff --git a/src/cookies/Makefile b/src/cookies/Makefile index 2fa4aebf..ca49e07d 100644 --- a/src/cookies/Makefile +++ b/src/cookies/Makefile @@ -9,9 +9,6 @@ TEST_PROGS = \ TESTDEPS = path.o -TESTDEPS-$(CONFIG_UTF8) += $(top_builddir)/src/intl/width.o - - PARSETSTDEPS = \ $(top_builddir)/src/util/error.o \ $(top_builddir)/src/util/string.o diff --git a/src/document/html/test/Makefile b/src/document/html/test/Makefile index f6cf7a76..c5363bfa 100644 --- a/src/document/html/test/Makefile +++ b/src/document/html/test/Makefile @@ -6,7 +6,4 @@ TEST_PROGS = parse-meta-refresh-test TESTDEPS += \ $(top_builddir)/src/document/html/parse-meta-refresh.o -TESTDEPS-$(CONFIG_UTF8) += $(top_builddir)/src/intl/width.o - - include $(top_srcdir)/Makefile.lib diff --git a/src/protocol/ftp/Makefile b/src/protocol/ftp/Makefile index 6a8c8a61..bcd0019d 100644 --- a/src/protocol/ftp/Makefile +++ b/src/protocol/ftp/Makefile @@ -10,6 +10,4 @@ TESTDEPS = \ $(top_builddir)/src/protocol/date.o \ $(top_builddir)/src/protocol/ftp/parse.o -TESTDEPS-$(CONFIG_UTF8) += $(top_builddir)/src/intl/width.o - include $(top_srcdir)/Makefile.lib diff --git a/src/protocol/test/Makefile b/src/protocol/test/Makefile index ce77529c..05435ec4 100644 --- a/src/protocol/test/Makefile +++ b/src/protocol/test/Makefile @@ -10,7 +10,6 @@ TESTDEPS = \ stub.o TESTDEPS-$(CONFIG_NLS) += $(top_builddir)/src/intl/gettext/lib.o -TESTDEPS-$(CONFIG_UTF8) += $(top_builddir)/src/intl/width.o CLEAN = stub.o