mirror of
https://github.com/rkd77/elinks.git
synced 2024-12-04 14:46:47 -05:00
Use the new OBJS-unless$(CONFIG_FOO) instead of $(call not,...)
This commit is contained in:
parent
7033247905
commit
e07354f5d5
@ -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
|
||||
|
@ -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 += \
|
||||
|
@ -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 = \
|
||||
|
Loading…
Reference in New Issue
Block a user