Commit 63605d28 authored by Yang Tse's avatar Yang Tse
Browse files

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

parent f4cc54cb

packages/OS400/make-tests.sh

+0 −2
Original line number Diff line number Diff line
@@ -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'                                                          \

src/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -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

src/Makefile.b32

+1 −2
Original line number Diff line number Diff line
@@ -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:

src/Makefile.inc

+5 −4
Original line number Diff line number Diff line
@@ -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 \

src/makefile.amiga

+0 −2
Original line number Diff line number Diff line
@@ -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)