From 63605d281f804382d2bd2d8655d73e188c12e071 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Sun, 20 Jan 2013 04:17:11 +0100
Subject: Makefile.inc: fix $(top_srcdir) not allowed in _SOURCES variables

---
 src/Makefile.am    | 4 ++--
 src/Makefile.b32   | 3 +--
 src/Makefile.inc   | 9 +++++----
 src/makefile.amiga | 2 --
 src/makefile.dj    | 1 -
 5 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 7e98d115b..af5a48800 100644
--- 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 804ac6d14..31d89f6e2 100644
--- 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 7ce30f0b6..cd890accc 100644
--- 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 4be7e25a3..7b9b1c0be 100644
--- 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 37db70a14..d34285950 100644
--- 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
-- 
cgit v1.2.3