diff options
| -rw-r--r-- | tests/libtest/Makefile.inc | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc index 5d1c773e5..ed4fdcf69 100644 --- a/tests/libtest/Makefile.inc +++ b/tests/libtest/Makefile.inc @@ -28,6 +28,9 @@ TSTTRACE = testtrace.c testtrace.h # files used only in some libcurl test programs WARNLESS = ../../lib/warnless.c ../../lib/warnless.h +# files used only in some libcurl test programs +MULTIBYTE = ../../lib/curl_multibyte.c ../../lib/curl_multibyte.h + # these files are used in every single test program below SUPPORTFILES = first.c test.h @@ -76,7 +79,7 @@ libntlmconnect_CPPFLAGS = $(AM_CPPFLAGS) libauthretry_SOURCES = libauthretry.c $(SUPPORTFILES) libauthretry_CPPFLAGS = $(AM_CPPFLAGS) -lib500_SOURCES = lib500.c $(SUPPORTFILES) $(TESTUTIL) $(TSTTRACE) +lib500_SOURCES = lib500.c $(SUPPORTFILES) $(TESTUTIL) $(TSTTRACE) $(MULTIBYTE) lib500_LDADD = $(TESTUTIL_LIBS) lib500_CPPFLAGS = $(AM_CPPFLAGS) @@ -95,7 +98,7 @@ lib504_SOURCES = lib504.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib504_LDADD = $(TESTUTIL_LIBS) lib504_CPPFLAGS = $(AM_CPPFLAGS) -lib505_SOURCES = lib505.c $(SUPPORTFILES) +lib505_SOURCES = lib505.c $(SUPPORTFILES) $(MULTIBYTE) lib505_CPPFLAGS = $(AM_CPPFLAGS) lib506_SOURCES = lib506.c $(SUPPORTFILES) @@ -135,7 +138,7 @@ lib516_CPPFLAGS = $(AM_CPPFLAGS) lib517_SOURCES = lib517.c $(SUPPORTFILES) lib517_CPPFLAGS = $(AM_CPPFLAGS) -lib518_SOURCES = lib518.c $(SUPPORTFILES) $(WARNLESS) +lib518_SOURCES = lib518.c $(SUPPORTFILES) $(WARNLESS) $(MULTIBYTE) lib518_CPPFLAGS = $(AM_CPPFLAGS) lib519_SOURCES = lib519.c $(SUPPORTFILES) @@ -153,7 +156,7 @@ lib523_CPPFLAGS = $(AM_CPPFLAGS) lib524_SOURCES = lib524.c $(SUPPORTFILES) lib524_CPPFLAGS = $(AM_CPPFLAGS) -lib525_SOURCES = lib525.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib525_SOURCES = lib525.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) $(MULTIBYTE) lib525_LDADD = $(TESTUTIL_LIBS) lib525_CPPFLAGS = $(AM_CPPFLAGS) @@ -165,7 +168,7 @@ lib527_SOURCES = lib526.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib527_LDADD = $(TESTUTIL_LIBS) lib527_CPPFLAGS = $(AM_CPPFLAGS) -DLIB527 -lib529_SOURCES = lib525.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib529_SOURCES = lib525.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) $(MULTIBYTE) lib529_LDADD = $(TESTUTIL_LIBS) lib529_CPPFLAGS = $(AM_CPPFLAGS) -DLIB529 @@ -181,7 +184,7 @@ lib533_SOURCES = lib533.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib533_LDADD = $(TESTUTIL_LIBS) lib533_CPPFLAGS = $(AM_CPPFLAGS) -lib537_SOURCES = lib537.c $(SUPPORTFILES) $(WARNLESS) +lib537_SOURCES = lib537.c $(SUPPORTFILES) $(WARNLESS) $(MULTIBYTE) lib537_CPPFLAGS = $(AM_CPPFLAGS) lib539_SOURCES = lib539.c $(SUPPORTFILES) @@ -191,7 +194,7 @@ lib540_SOURCES = lib540.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib540_LDADD = $(TESTUTIL_LIBS) lib540_CPPFLAGS = $(AM_CPPFLAGS) -lib541_SOURCES = lib541.c $(SUPPORTFILES) +lib541_SOURCES = lib541.c $(SUPPORTFILES) $(MULTIBYTE) lib541_CPPFLAGS = $(AM_CPPFLAGS) lib542_SOURCES = lib542.c $(SUPPORTFILES) @@ -254,25 +257,25 @@ lib564_CPPFLAGS = $(AM_CPPFLAGS) lib565_SOURCES = lib510.c $(SUPPORTFILES) lib565_CPPFLAGS = $(AM_CPPFLAGS) -DLIB565 -lib566_SOURCES = lib566.c $(SUPPORTFILES) +lib566_SOURCES = lib566.c $(SUPPORTFILES) $(MULTIBYTE) lib566_CPPFLAGS = $(AM_CPPFLAGS) lib567_SOURCES = lib567.c $(SUPPORTFILES) lib567_CPPFLAGS = $(AM_CPPFLAGS) -lib568_SOURCES = lib568.c $(SUPPORTFILES) +lib568_SOURCES = lib568.c $(SUPPORTFILES) $(MULTIBYTE) lib568_CPPFLAGS = $(AM_CPPFLAGS) -lib569_SOURCES = lib569.c $(SUPPORTFILES) +lib569_SOURCES = lib569.c $(SUPPORTFILES) $(MULTIBYTE) lib569_CPPFLAGS = $(AM_CPPFLAGS) lib570_SOURCES = lib570.c $(SUPPORTFILES) lib570_CPPFLAGS = $(AM_CPPFLAGS) -lib571_SOURCES = lib571.c $(SUPPORTFILES) $(WARNLESS) +lib571_SOURCES = lib571.c $(SUPPORTFILES) $(WARNLESS) $(MULTIBYTE) lib571_CPPFLAGS = $(AM_CPPFLAGS) -lib572_SOURCES = lib572.c $(SUPPORTFILES) +lib572_SOURCES = lib572.c $(SUPPORTFILES) $(MULTIBYTE) lib572_CPPFLAGS = $(AM_CPPFLAGS) lib573_SOURCES = lib573.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) $(TSTTRACE) @@ -289,20 +292,20 @@ lib575_CPPFLAGS = $(AM_CPPFLAGS) lib576_SOURCES = lib576.c $(SUPPORTFILES) lib576_CPPFLAGS = $(AM_CPPFLAGS) -lib578_SOURCES = lib578.c $(SUPPORTFILES) +lib578_SOURCES = lib578.c $(SUPPORTFILES) $(MULTIBYTE) lib578_CPPFLAGS = $(AM_CPPFLAGS) -lib579_SOURCES = lib579.c $(SUPPORTFILES) +lib579_SOURCES = lib579.c $(SUPPORTFILES) $(MULTIBYTE) lib579_CPPFLAGS = $(AM_CPPFLAGS) -lib582_SOURCES = lib582.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib582_SOURCES = lib582.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) $(MULTIBYTE) lib582_LDADD = $(TESTUTIL_LIBS) lib582_CPPFLAGS = $(AM_CPPFLAGS) lib583_SOURCES = lib583.c $(SUPPORTFILES) lib583_CPPFLAGS = $(AM_CPPFLAGS) -lib585_SOURCES = lib500.c $(SUPPORTFILES) $(TESTUTIL) $(TSTTRACE) +lib585_SOURCES = lib500.c $(SUPPORTFILES) $(TESTUTIL) $(TSTTRACE) $(MULTIBYTE) lib585_LDADD = $(TESTUTIL_LIBS) lib585_CPPFLAGS = $(AM_CPPFLAGS) -DLIB585 @@ -318,7 +321,7 @@ lib589_CPPFLAGS = $(AM_CPPFLAGS) lib590_SOURCES = lib590.c $(SUPPORTFILES) lib590_CPPFLAGS = $(AM_CPPFLAGS) -lib591_SOURCES = lib591.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib591_SOURCES = lib591.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) $(MULTIBYTE) lib591_LDADD = $(TESTUTIL_LIBS) lib591_CPPFLAGS = $(AM_CPPFLAGS) @@ -329,7 +332,7 @@ lib597_CPPFLAGS = $(AM_CPPFLAGS) lib598_SOURCES = lib598.c $(SUPPORTFILES) lib598_CPPFLAGS = $(AM_CPPFLAGS) -lib599_SOURCES = lib599.c $(SUPPORTFILES) +lib599_SOURCES = lib599.c $(SUPPORTFILES) $(MULTIBYTE) lib599_CPPFLAGS = $(AM_CPPFLAGS) lib643_SOURCES = lib643.c $(SUPPORTFILES) @@ -611,7 +614,7 @@ lib1596_SOURCES = lib1594.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib1596_LDADD = $(TESTUTIL_LIBS) lib1596_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1596 -lib1900_SOURCES = lib1900.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib1900_SOURCES = lib1900.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) $(MULTIBYTE) lib1900_LDADD = $(TESTUTIL_LIBS) lib1900_CPPFLAGS = $(AM_CPPFLAGS) |