From 3d8c093145e1bd04fd1d0c187df29bc0e5942b91 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sat, 7 Apr 2012 00:31:24 +0200 Subject: [PATCH] curl tool: use configuration files from lib directory - follow-up I amigaos.[ch] now integrates nicely with any libcurl build --- lib/Makefile.am | 2 +- lib/Makefile.inc | 4 ++-- lib/makefile.amiga | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/Makefile.am b/lib/Makefile.am index d764274fc..52cbdd700 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -33,7 +33,7 @@ CMAKE_DIST = CMakeLists.txt curl_config.h.cmake EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 $(DSP) \ vc6libcurl.dsw config-win32.h config-win32ce.h config-riscos.h \ config-mac.h curl_config.h.in makefile.dj config-dos.h libcurl.plist \ - libcurl.rc config-amigaos.h amigaos.c amigaos.h makefile.amiga \ + libcurl.rc config-amigaos.h makefile.amiga \ Makefile.netware nwlib.c nwos.c libcurl.imp msvcproj.head msvcproj.foot \ config-win32ce.h config-os400.h setup-os400.h config-symbian.h \ Makefile.Watcom config-tpf.h $(DOCS) $(VCPROJ) mk-ca-bundle.pl \ diff --git a/lib/Makefile.inc b/lib/Makefile.inc index ec7f50537..69ad159f3 100644 --- a/lib/Makefile.inc +++ b/lib/Makefile.inc @@ -14,7 +14,7 @@ CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c \ curl_fnmatch.c fileinfo.c ftplistparser.c wildcard.c krb5.c \ memdebug.c http_chunks.c strtok.c connect.c llist.c hash.c multi.c \ content_encoding.c share.c http_digest.c md4.c md5.c curl_rand.c \ - http_negotiate.c inet_pton.c strtoofft.c strerror.c \ + http_negotiate.c inet_pton.c strtoofft.c strerror.c amigaos.c \ hostasyn.c hostip4.c hostip6.c hostsyn.c inet_ntop.c parsedate.c \ select.c gtls.c sslgen.c tftp.c splay.c strdup.c socks.c ssh.c nss.c \ qssl.c rawstr.c curl_addrinfo.c socks_gssapi.c socks_sspi.c \ @@ -31,7 +31,7 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h \ getinfo.h strequal.h krb4.h memdebug.h http_chunks.h curl_rand.h \ curl_fnmatch.h wildcard.h fileinfo.h ftplistparser.h strtok.h \ connect.h llist.h hash.h content_encoding.h share.h curl_md4.h \ - curl_md5.h http_digest.h http_negotiate.h inet_pton.h \ + curl_md5.h http_digest.h http_negotiate.h inet_pton.h amigaos.h \ strtoofft.h strerror.h inet_ntop.h curlx.h curl_memory.h setup.h \ transfer.h select.h easyif.h multiif.h parsedate.h sslgen.h gtls.h \ tftp.h sockaddr.h splay.h strdup.h setup_once.h socks.h ssh.h nssg.h \ diff --git a/lib/makefile.amiga b/lib/makefile.amiga index 7b7fa8fab..c692e5ebe 100644 --- a/lib/makefile.amiga +++ b/lib/makefile.amiga @@ -11,7 +11,6 @@ CC = m68k-amigaos-gcc CFLAGS = -I$(ATCPSDKI) -m68020-60 -O2 -msoft-float -noixemul -g -I. -I../include -W -Wall include Makefile.inc -CSOURCES += amigaos.c OBJS = $(CSOURCES:.c=.o) all: $(OBJS)