From af4b7bed845c52fb433e5bfe1118839050ea5936 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Wed, 29 Aug 2007 01:57:01 +0200
Subject: [PATCH] Use the new OBJS-unless$(CONFIG_FOO) instead of $(call
 not,...)

---
 Makefile.config.in | 4 ----
 Makefile.lib       | 3 +--
 src/util/Makefile  | 6 +++---
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Makefile.config.in b/Makefile.config.in
index 8d88367e..7cd24d3e 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -184,10 +184,6 @@ MAKE_COLOR = @MAKE_COLOR@
 
 LIB_O_NAME = lib.o
 
-# Reverse a CONFIG_* string
-# Usage $(call not,$(CONFIG_FOO))
-not = $(if $(findstring yes,$(1)),no,yes)
-
 ### This is here because Makefile.config is usually the first thing
 ### we get and sometimes the all rule can be implicit, yet we want
 ### it always as the default one. So this should make sure it always
diff --git a/Makefile.lib b/Makefile.lib
index d48f0880..7f02f130 100644
--- a/Makefile.lib
+++ b/Makefile.lib
@@ -191,8 +191,7 @@ test-default:
 
 ifdef TEST_PROGS
 TESTDEPS-$(CONFIG_DEBUG) += $(top_builddir)/src/util/memdebug.o
-TESTDEPS-$(call not,$(CONFIG_SMALL)) += \
- $(top_builddir)/src/util/fastfind.o \
+TESTDEPS-unless$(CONFIG_SMALL) += $(top_builddir)/src/util/fastfind.o
 
 # Add most of the basic utility library to the test dependencies.
 TESTDEPS += \
diff --git a/src/util/Makefile b/src/util/Makefile
index 17b03227..1a453c4d 100644
--- a/src/util/Makefile
+++ b/src/util/Makefile
@@ -3,7 +3,7 @@ include $(top_builddir)/Makefile.config
 
 INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS)
 
-OBJS-$(call not,$(CONFIG_SMALL))	 += fastfind.o
+OBJS-unless$(CONFIG_SMALL)		 += fastfind.o
 OBJS-$(CONFIG_CSS)			 += scanner.o
 OBJS-$(CONFIG_DEBUG)			 += memdebug.o
 OBJS-$(CONFIG_DOM)			 += scanner.o
@@ -12,14 +12,14 @@ OBJS-$(CONFIG_DOM)			 += scanner.o
 # (either the real thing or GNUTLS compat wrappers).
 OBJS-$(CONFIG_OWN_LIBC)			 += md5.o
 ifeq ($(CONFIG_GNUTLS_OPENSSL_COMPAT),no)
-OBJS-$(call not,$(CONFIG_OPENSSL))	 += md5.o
+OBJS-unless$(CONFIG_OPENSSL)		 += md5.o
 endif
 
 ifeq ($(CONFIG_BITTORRENT),yes)
 # BitTorrent is the only user. Compile in SHA1 if testing libc or
 # there is no OpenSSL. The GNUTLS OpenSSL wrappers doesn't have it.
 OBJS-$(CONFIG_OWN_LIBC)			 += sha1.o
-OBJS-$(call not,$(CONFIG_OPENSSL))	 += sha1.o
+OBJS-unless$(CONFIG_OPENSSL)		 += sha1.o
 endif
 
 OBJS = \