diff options
author | Daniel Stenberg <daniel@haxx.se> | 2016-11-07 10:36:23 +0100 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2016-11-07 10:36:23 +0100 |
commit | 27302abb9467f21a481fcc6b8eca53d34e04373b (patch) | |
tree | aac900406c50dfd139fe48d7d6168555fdeed87e /src | |
parent | 0269f6446de2e16eab272f9a6e37eec861035ea7 (diff) |
s/cURL/curl
We're mostly saying just "curl" in lower case these days so here's a big
cleanup to adapt to this reality. A few instances are left as the
project could still formally be considered called cURL.
Diffstat (limited to 'src')
-rw-r--r-- | src/CMakeLists.txt | 8 | ||||
-rw-r--r-- | src/Makefile.Watcom | 4 | ||||
-rw-r--r-- | src/Makefile.netware | 2 | ||||
-rw-r--r-- | src/macos/MACINSTALL.TXT | 2 | ||||
-rw-r--r-- | src/makefile.amiga | 6 | ||||
-rw-r--r-- | src/makefile.dj | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cfcefb396..9bbeb6054 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -49,9 +49,9 @@ add_executable( ${CURL_FILES} ) -source_group("cURLX source files" FILES ${CURLX_CFILES}) -source_group("cURL source files" FILES ${CURL_CFILES}) -source_group("cURL header files" FILES ${CURL_HFILES}) +source_group("curlX source files" FILES ${CURLX_CFILES}) +source_group("curl source files" FILES ${CURL_CFILES}) +source_group("curl header files" FILES ${CURL_HFILES}) include_directories( ${CURL_SOURCE_DIR}/lib # To be able to reach "curl_setup_once.h" @@ -61,7 +61,7 @@ include_directories( ${CURL_SOURCE_DIR}/src # To be able to reach "tool_hugehelp.h" ) -#Build cURL executable +#Build curl executable target_link_libraries( ${EXE_NAME} libcurl ${CURL_LIBS}) ################################################################################ diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom index f1ddc29fa..25cd3bf88 100644 --- a/src/Makefile.Watcom +++ b/src/Makefile.Watcom @@ -22,7 +22,7 @@ #*************************************************************************** # -# Watcom / OpenWatcom / Win32 makefile for cURL. +# Watcom / OpenWatcom / Win32 makefile for curl. # .ERASE @@ -156,7 +156,7 @@ RESOURCE = $(OBJ_DIR)/curl.res DIRS = $(OBJ_DIR) all: tool_hugehelp.c $(DIRS) $(TARGETS) .SYMBOLIC - @echo Welcome to cURL + @echo Welcome to curl clean: .SYMBOLIC -rm -f $(OBJS) diff --git a/src/Makefile.netware b/src/Makefile.netware index 3e4f6546d..a927da592 100644 --- a/src/Makefile.netware +++ b/src/Makefile.netware @@ -102,7 +102,7 @@ endif TARGET = curl VERSION = $(LIBCURL_VERSION) COPYR = Copyright (C) $(LIBCURL_COPYRIGHT_STR) -DESCR = cURL $(LIBCURL_VERSION_STR) ($(LIBARCH)) - https://curl.haxx.se +DESCR = curl $(LIBCURL_VERSION_STR) ($(LIBARCH)) - https://curl.haxx.se MTSAFE = YES STACK = 64000 SCREEN = $(TARGET) commandline utility diff --git a/src/macos/MACINSTALL.TXT b/src/macos/MACINSTALL.TXT index 1839ef205..ce4d1dce4 100644 --- a/src/macos/MACINSTALL.TXT +++ b/src/macos/MACINSTALL.TXT @@ -1 +1 @@ -MACOS (not MACOS X)
===================
This is the first attempt at porting cURL to MacOS.
http, ftp, dict and telnet seems to work fine, other protocols and advanced
features have not been all tested.
This port is heavily based on the GUSI library from Matthias Neeracher.
GUSI (Grand Unified Socket Interface) is a POSIX/Pthreads/Sockets library
bringing some of the comforts of UNIX 98 to traditional MacOS.
The latest GUSI release can be downloaded from sourceforge
at <http://sourceforge.net/projects/gusi/>
I have also written a few functions to help port Unix applications to MacOS.
These functions are part of the GUSI Extra library that can be downloaded at
<http://perso.wanadoo.fr/ela/resources.html#gusiextra>
OpenSSL support is still experimental but I hope to deliver a version
including SSL soon.
cURL for MacOS requires using the CodeWarrior compiler from Metrowerks.
First download GUSI, GUSI Extra and cURL. Access paths have been setup so that
GUSI, GUSI Extra and cURL directories should have the same parent directory.
Follow the instructions in GUSI Extra "readme.txt" mainly the ones related to
SIOUX and GUSI patches. If you do not apply these patches curl will not behave
correctly.
In the 'curl/src/macos' directory, decode "curl.mcp.xml.sit.hqx" (This is a
stuffit binhexed file)
From the CodeWarrior IDE, import 'curl/src/macos/curl.xml', adjust the access
paths if required. Then you should be able to build:
- the libcurl libraries for PPC and 68K.
- the curl application (also available for PPC and 68K) which is the command
line version of cURL.
If the file "tool_hugehelp.c" is missing rename "curl/src/tool_hugehelp.c.cvs"
to "tool_hugehelp.c" and make sure its file type is 'TEXT'
+MACOS (not MACOS X)
===================
This is the first attempt at porting curl to MacOS.
http, ftp, dict and telnet seems to work fine, other protocols and advanced
features have not been all tested.
This port is heavily based on the GUSI library from Matthias Neeracher.
GUSI (Grand Unified Socket Interface) is a POSIX/Pthreads/Sockets library
bringing some of the comforts of UNIX 98 to traditional MacOS.
The latest GUSI release can be downloaded from sourceforge
at <http://sourceforge.net/projects/gusi/>
I have also written a few functions to help port Unix applications to MacOS.
These functions are part of the GUSI Extra library that can be downloaded at
<http://perso.wanadoo.fr/ela/resources.html#gusiextra>
OpenSSL support is still experimental but I hope to deliver a version
including SSL soon.
curl for MacOS requires using the CodeWarrior compiler from Metrowerks.
First download GUSI, GUSI Extra and curl. Access paths have been setup so that
GUSI, GUSI Extra and curl directories should have the same parent directory.
Follow the instructions in GUSI Extra "readme.txt" mainly the ones related to
SIOUX and GUSI patches. If you do not apply these patches curl will not behave
correctly.
In the 'curl/src/macos' directory, decode "curl.mcp.xml.sit.hqx" (This is a
stuffit binhexed file)
From the CodeWarrior IDE, import 'curl/src/macos/curl.xml', adjust the access
paths if required. Then you should be able to build:
- the libcurl libraries for PPC and 68K.
- the curl application (also available for PPC and 68K) which is the command
line version of curl.
If the file "tool_hugehelp.c" is missing rename "curl/src/tool_hugehelp.c.cvs"
to "tool_hugehelp.c" and make sure its file type is 'TEXT'
diff --git a/src/makefile.amiga b/src/makefile.amiga index 25449a6dc..9f3748b1a 100644 --- a/src/makefile.amiga +++ b/src/makefile.amiga @@ -1,5 +1,5 @@ # -# $VER: cURL Makefile for AmigaOS ... +# $VER: curl Makefile for AmigaOS ... # # change the follow to where you have the AmiTCP SDK v4.3 includes: @@ -19,12 +19,12 @@ include Makefile.inc OBJS = $(CURL_CFILES:.c=.o) $(CURLX_CFILES:.c=.o) all: tool_hugehelp.c $(OBJS) - $(CC) $(CFLAGS) -o cURL $(OBJS) $(LIBS) -Wl,-Map,cURL.map,--cref + $(CC) $(CFLAGS) -o curl $(OBJS) $(LIBS) -Wl,-Map,curl.map,--cref tool_hugehelp.c: $(README) $(MANPAGE) mkhelp.pl rm -f tool_hugehelp.c /bin/nroff -man $(MANPAGE) | /bin/perl $(MKHELP) -c $(README) > tool_hugehelp.c install: - $(INSTALL) -c cURL /c/cURL + $(INSTALL) -c curl /c/curl diff --git a/src/makefile.dj b/src/makefile.dj index 6a6c8f95f..c3bbc237f 100644 --- a/src/makefile.dj +++ b/src/makefile.dj @@ -59,7 +59,7 @@ PROGRAM = curl.exe OBJECTS += $(addprefix $(OBJ_DIR)/, $(CSOURCES:.c=.o)) all: $(OBJ_DIR) $(PROGRAM) - @echo Welcome to cURL + @echo Welcome to curl $(PROGRAM): $(OBJECTS) ../lib/libcurl.a $(CC) -o $@ $^ $(LDFLAGS) $(EX_LIBS) |