diff options
| -rw-r--r-- | packages/OS400/make-tests.sh | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/Makefile.b32 | 3 | ||||
| -rw-r--r-- | src/Makefile.inc | 9 | ||||
| -rw-r--r-- | src/makefile.amiga | 2 | ||||
| -rw-r--r-- | src/makefile.dj | 1 | ||||
| -rw-r--r-- | tests/libtest/Makefile.inc | 4 | ||||
| -rw-r--r-- | tests/server/Makefile.inc | 36 | ||||
| -rw-r--r-- | tests/unit/Makefile.inc | 4 | ||||
| -rw-r--r-- | winbuild/Makefile.vc | 1 |
10 files changed, 30 insertions, 36 deletions
diff --git a/packages/OS400/make-tests.sh b/packages/OS400/make-tests.sh index e40b41046..cee3ed95d 100644 --- 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 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 diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc index 8e5248d25..d5a36becd 100644 --- 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 4a12ea872..6e81dfdbc 100644 --- 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 c6d9d28c4..20835d709 100644 --- 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 b7c00cfd5..bc4283266 100644 --- a/winbuild/Makefile.vc +++ b/winbuild/Makefile.vc @@ -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
|