mirror of
https://github.com/rkd77/elinks.git
synced 2024-12-04 14:46:47 -05:00
Fix 'make test' dependency when building test utility programs
Problems was caused by undefined symbols: src/util/conv.c:308: undefined reference to `is_cp_utf8' src/util/conv.c:320: undefined reference to `cp2u'
This commit is contained in:
parent
56f692ef08
commit
8bfab2242e
@ -182,6 +182,10 @@ 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
|
||||
|
@ -16,6 +16,7 @@ mailcap-cache.o: mailcap.c
|
||||
|
||||
TESTDEPS = \
|
||||
common.o \
|
||||
$(top_builddir)/src/intl/charsets.o \
|
||||
$(top_builddir)/src/osdep/osdep.o \
|
||||
$(top_builddir)/src/osdep/stub.o \
|
||||
$(top_builddir)/src/util/conv.o \
|
||||
@ -28,5 +29,8 @@ TESTDEPS = \
|
||||
|
||||
TESTDEPS-$(CONFIG_NLS) += $(top_builddir)/src/intl/gettext/lib.o
|
||||
TESTDEPS-$(CONFIG_DEBUG) += $(top_builddir)/src/util/memdebug.o
|
||||
TESTDEPS-$(call not,$(CONFIG_SMALL)) += \
|
||||
$(top_builddir)/src/util/fastfind.o \
|
||||
|
||||
|
||||
include $(top_srcdir)/Makefile.lib
|
||||
|
@ -3,9 +3,11 @@ include $(top_builddir)/Makefile.config
|
||||
|
||||
OBJS = ftp.o parse.o
|
||||
|
||||
TEST_PROGS = ftp-parser
|
||||
TEST_PROGS = \
|
||||
ftp-parser
|
||||
|
||||
TESTDEPS = \
|
||||
$(top_builddir)/src/intl/charsets.o \
|
||||
$(top_builddir)/src/osdep/stub.o \
|
||||
$(top_builddir)/src/protocol/date.o \
|
||||
$(top_builddir)/src/protocol/ftp/parse.o \
|
||||
@ -16,4 +18,7 @@ TESTDEPS = \
|
||||
$(top_builddir)/src/util/string.o \
|
||||
$(top_builddir)/src/util/time.o
|
||||
|
||||
TESTDEPS-$(call not,$(CONFIG_SMALL)) += \
|
||||
$(top_builddir)/src/util/fastfind.o \
|
||||
|
||||
include $(top_srcdir)/Makefile.lib
|
||||
|
@ -3,10 +3,6 @@ include $(top_builddir)/Makefile.config
|
||||
|
||||
INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS)
|
||||
|
||||
# Reverse a CONFIG_* string
|
||||
# Usage $(call not,$(CONFIG_FOO))
|
||||
not = $(if $(findstring yes,$(1)),no,yes)
|
||||
|
||||
OBJS-$(call not,$(CONFIG_SMALL)) += fastfind.o
|
||||
OBJS-$(CONFIG_CSS) += scanner.o
|
||||
OBJS-$(CONFIG_DEBUG) += memdebug.o
|
||||
|
Loading…
Reference in New Issue
Block a user