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

diff --git a/packages/OS400/make-tests.sh b/packages/OS400/make-tests.sh
index e40b41046427a55f3a3578787b8d65903d9cb016..cee3ed95d2d08995e4bb5ce0e7b21dc567c8835f 100644 (file)
--- a/packages/OS400/make-tests.sh
+++ b/packages/OS400/make-tests.sh
@@ -22,8 +22,6 @@ cd libtest
 #       _ Retain only lines that begins with "identifier =".
 #       _ Turn these lines into shell variable assignments.
 
-top_srcdir="${TOPDIR}"
-export top_srcdir
 eval "`sed -e ': begin'                                                 \
         -e '/\\\\$/{'                                                   \
         -e 'N'                                                          \

diff --git a/src/Makefile.am b/src/Makefile.am
index 7e98d115bafe9c108e27bd6a2cf6f1ea1f73ca3e..af5a48800f717aaaa1b11815663d91c8d530137a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -116,7 +116,7 @@ endif
 # ignore tool_hugehelp.c since it is generated source code and it plays
 # by slightly different rules!
 checksrc:
-       @@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/src -Wtool_hugehelp.c $(curl_SOURCES)
+       @@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/src -Wtool_hugehelp.c $(CURL_CFILES) $(CURL_HFILES)
 
 if CURLDEBUG
 # for debug builds, we scan the sources on all regular make invokes

diff --git a/src/Makefile.b32 b/src/Makefile.b32
index 804ac6d14b70d436c3621454b7a7f36c147e9ec1..31d89f6e2f531918e7808436f849b3228e85018c 100644 (file)
--- a/src/Makefile.b32
+++ b/src/Makefile.b32
@@ -77,10 +77,9 @@ LINKLIB  = $(LINKLIB) $(OPENSSL_PATH)\out32\ssleay32.lib $(OPENSSL_PATH)\out32\l
 .path.obj = $(OBJDIR)
 
 # Makefile.inc provides the CSOURCES and HHEADERS defines
-!undef top_srcdir
 !include Makefile.inc
 
-CSOURCES = $(CURL_CFILES) $(CURLX_ONES:/lib/=)
+CSOURCES = $(CURL_CFILES) $(CURLX_ONES:../lib/=)
 OBJECTS  = $(CSOURCES:.c=.obj)
 
 .c.obj:

diff --git a/src/Makefile.inc b/src/Makefile.inc
index 7ce30f0b62d858c4a4061f29f685866c07708e8f..cd890accc7a1060ae259be217935a583f1546bfa 100644 (file)
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -9,10 +9,11 @@
 
 # libcurl has sources that provide functions named curlx_* that aren't part of
 # the official API, but we re-use the code here to avoid duplication.
-CURLX_ONES = $(top_srcdir)/lib/strtoofft.c \
-       $(top_srcdir)/lib/strdup.c \
-       $(top_srcdir)/lib/rawstr.c \
-       $(top_srcdir)/lib/nonblock.c
+CURLX_ONES = \
+       ../lib/strtoofft.c \
+       ../lib/strdup.c \
+       ../lib/rawstr.c \
+       ../lib/nonblock.c
 
 CURL_CFILES = \
        tool_binmode.c \

diff --git a/src/makefile.amiga b/src/makefile.amiga
index 4be7e25a32f922e74a6e61689075190870f146c1..7b9b1c0becd2dee8a13aaccf801153264fc2d546 100644 (file)
--- a/src/makefile.amiga
+++ b/src/makefile.amiga
@@ -14,8 +14,6 @@ MANPAGE =     ../docs/curl.1
 README =       ../docs/MANUAL
 MKHELP =       ../src/mkhelp.pl
 
-top_srcdir = ..
-
 include Makefile.inc
 
 OBJS = $(CURL_CFILES:.c=.o) $(CURLX_ONES:.c=.o)

diff --git a/src/makefile.dj b/src/makefile.dj
index 37db70a14340b4d34b2e8d38fa3a54e8493b5b3b..d342859503dc86bf6adbad50d674d2acf41d2753 100644 (file)
--- a/src/makefile.dj
+++ b/src/makefile.dj
@@ -5,7 +5,6 @@
 
 DEPEND_PREREQ = # tool_hugehelp.c
 
-top_srcdir = ..
 TOPDIR = ..
 
 include ../packages/DOS/common.dj

diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
index 8e5248d254a3e033e99ffc2617e8d8eb399df848..d5a36becda1af990f24735b27db159c71453dbe3 100644 (file)
--- 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 4a12ea8722e24f1a3e0d01abefae6b273f4aa4b4..6e81dfdbc305920a0e4e7f9f5bee42de6c0faaf1 100644 (file)
--- 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 c6d9d28c4476fca731e65d5b7f4e357ddff9f067..20835d7094e3cd244436fe3d8f8c1edf5fb02c92 100644 (file)
--- 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 \

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index b7c00cfd52daf77eecfab66bcee4cb1f5b3f7a1f..bc4283266ef3e2d2cbfd4bf64dfcf02a0188d1c7 100644 (file)
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -40,7 +40,6 @@ CFGSET=true
 !INCLUDE "../lib/Makefile.inc"\r
 LIBCURL_OBJS=$(CSOURCES:.c=.obj)\r
 \r
-top_srcdir=..\r
 !INCLUDE "../src/Makefile.inc"\r
 \r
 # tool_hugehelp has a special rule\r