aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

Revert "Use the new OBJS-unless$(CONFIG_FOO) instead of $(call not,...)"

Browse Source 
This reverts commit e07354f5d5.
This commit is contained in:
Laurent MONIN 2007-09-14 17:43:36 +02:00
parent 07535cf886
commit b389d1b20e
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.config.in
View File

@ -184,6 +184,10 @@ MAKE_COLOR = @MAKE_COLOR@
LIB_O_NAME = lib.o 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 ### This is here because Makefile.config is usually the first thing
### we get and sometimes the all rule can be implicit, yet we want ### 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 ### it always as the default one. So this should make sure it always

3
Makefile.lib
View File

@ -191,7 +191,8 @@ test-default:
ifdef TEST_PROGS ifdef TEST_PROGS
TESTDEPS-$(CONFIG_DEBUG) += $(top_builddir)/src/util/memdebug.o TESTDEPS-$(CONFIG_DEBUG) += $(top_builddir)/src/util/memdebug.o
TESTDEPS-unless$(CONFIG_SMALL) += $(top_builddir)/src/util/fastfind.o TESTDEPS-$(call not,$(CONFIG_SMALL)) += \
$(top_builddir)/src/util/fastfind.o \
# Add most of the basic utility library to the test dependencies. # Add most of the basic utility library to the test dependencies.
TESTDEPS += \ TESTDEPS += \

6
src/util/Makefile
View File

@ -3,7 +3,7 @@ include $(top_builddir)/Makefile.config
INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS) INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS)
OBJS-unless$(CONFIG_SMALL) += fastfind.o OBJS-$(call not,$(CONFIG_SMALL)) += fastfind.o
OBJS-$(CONFIG_CSS) += scanner.o OBJS-$(CONFIG_CSS) += scanner.o
OBJS-$(CONFIG_DEBUG) += memdebug.o OBJS-$(CONFIG_DEBUG) += memdebug.o
OBJS-$(CONFIG_DOM) += scanner.o OBJS-$(CONFIG_DOM) += scanner.o
@ -12,14 +12,14 @@ OBJS-$(CONFIG_DOM) += scanner.o
# (either the real thing or GNUTLS compat wrappers). # (either the real thing or GNUTLS compat wrappers).
OBJS-$(CONFIG_OWN_LIBC) += md5.o OBJS-$(CONFIG_OWN_LIBC) += md5.o
ifeq ($(CONFIG_GNUTLS_OPENSSL_COMPAT),no) ifeq ($(CONFIG_GNUTLS_OPENSSL_COMPAT),no)
OBJS-unless$(CONFIG_OPENSSL) += md5.o OBJS-$(call not,$(CONFIG_OPENSSL)) += md5.o
endif endif
ifeq ($(CONFIG_BITTORRENT),yes) ifeq ($(CONFIG_BITTORRENT),yes)
# BitTorrent is the only user. Compile in SHA1 if testing libc or # BitTorrent is the only user. Compile in SHA1 if testing libc or
# there is no OpenSSL. The GNUTLS OpenSSL wrappers doesn't have it. # there is no OpenSSL. The GNUTLS OpenSSL wrappers doesn't have it.
OBJS-$(CONFIG_OWN_LIBC) += sha1.o OBJS-$(CONFIG_OWN_LIBC) += sha1.o
OBJS-unless$(CONFIG_OPENSSL) += sha1.o OBJS-$(call not,$(CONFIG_OPENSSL)) += sha1.o
endif endif
OBJS = \ OBJS = \