generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/OS400/make-tests.sh
View File

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

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

4
tests/libtest/Makefile.inc
View File

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

36
tests/server/Makefile.inc
View File

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

4
tests/unit/Makefile.inc
View File

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

1
winbuild/Makefile.vc
View File

@ -40,7 +40,6 @@ CFGSET=true
!INCLUDE "../lib/Makefile.inc"
LIBCURL_OBJS=$(CSOURCES:.c=.obj)
top_srcdir=..
!INCLUDE "../src/Makefile.inc"
# tool_hugehelp has a special rule