romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-24 12:27:16 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Yang Tse 2013-01-20 04:17:11 +01:00
parent f4cc54cb47
commit 63605d281f
10 changed files with 30 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Makefile.am
View file

@ -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

3
src/Makefile.b32
View file

@ -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:

9
src/Makefile.inc
View file

@ -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 \

2
src/makefile.amiga
View file

@ -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)

1
src/makefile.dj
View file

@ -5,7 +5,6 @@
DEPEND_PREREQ = # tool_hugehelp.c
top_srcdir = ..
TOPDIR = ..
include ../packages/DOS/common.dj