Makefile.inc: fix $(top_srcdir) not allowed in _SOURCES variables

3 files changed, 22 insertions, 22 deletions

diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
index 8e5248d25..d5a36becd 100644
--- a/tests/libtest/Makefile.inc
+++ b/tests/libtest/Makefile.inc
@@ -5,7 +5,7 @@ TESTUTIL = testutil.c testutil.h
 TSTTRACE = testtrace.c testtrace.h
 
 # files used only in some libcurl test programs
-WARNLESS = $(top_srcdir)/lib/warnless.c $(top_srcdir)/lib/warnless.h
+WARNLESS = ../../lib/warnless.c ../../lib/warnless.h
 
 # these files are used in every single test program below
 SUPPORTFILES = first.c test.h
@@ -25,7 +25,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \
   \
   lib1500 lib1501 lib1502 lib1503 lib1504 lib1505
 
-chkhostname_SOURCES = chkhostname.c $(top_srcdir)/lib/curl_gethostname.c
+chkhostname_SOURCES = chkhostname.c ../../lib/curl_gethostname.c
 chkhostname_LDADD = @CURL_NETWORK_LIBS@
 chkhostname_DEPENDENCIES =
 chkhostname_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/tests/server/Makefile.inc b/tests/server/Makefile.inc
index 4a12ea872..6e81dfdbc 100644
--- a/tests/server/Makefile.inc
+++ b/tests/server/Makefile.inc
@@ -1,29 +1,29 @@
 noinst_PROGRAMS = getpart resolve rtspd sockfilt sws tftpd fake_ntlm
 
 CURLX_SRCS = \
- $(top_srcdir)/lib/mprintf.c \
- $(top_srcdir)/lib/nonblock.c \
- $(top_srcdir)/lib/strequal.c \
- $(top_srcdir)/lib/strtoofft.c \
- $(top_srcdir)/lib/timeval.c \
- $(top_srcdir)/lib/warnless.c
+ ../../lib/mprintf.c \
+ ../../lib/nonblock.c \
+ ../../lib/strequal.c \
+ ../../lib/strtoofft.c \
+ ../../lib/timeval.c \
+ ../../lib/warnless.c
 
 CURLX_HDRS = \
- $(top_srcdir)/lib/curlx.h \
- $(top_srcdir)/lib/nonblock.h \
- $(top_srcdir)/lib/strequal.h \
- $(top_srcdir)/lib/strtoofft.h \
- $(top_srcdir)/lib/timeval.h \
- $(top_srcdir)/lib/warnless.h
+ ../../lib/curlx.h \
+ ../../lib/nonblock.h \
+ ../../lib/strequal.h \
+ ../../lib/strtoofft.h \
+ ../../lib/timeval.h \
+ ../../lib/warnless.h
 
 USEFUL = \
  getpart.c \
  getpart.h \
  server_setup.h \
- $(top_srcdir)/lib/base64.c \
- $(top_srcdir)/lib/curl_base64.h \
- $(top_srcdir)/lib/memdebug.c \
- $(top_srcdir)/lib/memdebug.h
+ ../../lib/base64.c \
+ ../../lib/curl_base64.h \
+ ../../lib/memdebug.c \
+ ../../lib/memdebug.h
 
 UTIL = \
  util.c \
@@ -48,14 +48,14 @@ rtspd_CFLAGS = $(AM_CFLAGS)
 sockfilt_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
  server_sockaddr.h \
  sockfilt.c \
- $(top_srcdir)/lib/inet_pton.c
+ ../../lib/inet_pton.c
 sockfilt_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
 sockfilt_CFLAGS = $(AM_CFLAGS)
 
 sws_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
  server_sockaddr.h \
  sws.c \
- $(top_srcdir)/lib/inet_pton.c
+ ../../lib/inet_pton.c
 sws_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
 sws_CFLAGS = $(AM_CFLAGS)
 
diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc
index c6d9d28c4..20835d709 100644
--- a/tests/unit/Makefile.inc
+++ b/tests/unit/Makefile.inc
@@ -1,8 +1,8 @@
 # these files are used in every single unit test program
 
 UNITFILES = curlcheck.h \
- $(top_srcdir)/tests/libtest/test.h \
- $(top_srcdir)/tests/libtest/first.c
+ ../libtest/test.h \
+ ../libtest/first.c
 
 # These are all unit test programs
 UNITPROGS = unit1300 unit1301 unit1302 unit1303 unit1304 unit1305 unit1307 \