diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.Watcom | 2 | ||||
-rw-r--r-- | src/Makefile.am | 19 | ||||
-rw-r--r-- | src/Makefile.b32 | 4 | ||||
-rw-r--r-- | src/Makefile.m32 | 8 | ||||
-rw-r--r-- | src/Makefile.netware | 6 |
5 files changed, 20 insertions, 19 deletions
diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom index 25cd3bf88..67e542d7a 100644 --- a/src/Makefile.Watcom +++ b/src/Makefile.Watcom @@ -47,7 +47,7 @@ !ifdef %libname LIBNAME = $(%libname) !else -LIBNAME = libcurl +LIBNAME = libgnurl !endif TARGETS = curl.exe diff --git a/src/Makefile.am b/src/Makefile.am index bfcd877fc..a6bab6bdc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -41,7 +41,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/src -bin_PROGRAMS = curl +bin_PROGRAMS = gnurl SUBDIRS = ../docs @@ -52,7 +52,7 @@ endif include Makefile.inc # CURL_FILES comes from Makefile.inc -curl_SOURCES = $(CURL_FILES) +gnurl_SOURCES = $(CURL_FILES) # This might hold -Werror CFLAGS += @CURL_CFLAG_EXTRAS@ @@ -61,16 +61,16 @@ CFLAGS += @CURL_CFLAG_EXTRAS@ LIBS = $(BLANK_AT_MAKETIME) if USE_EXPLICIT_LIB_DEPS -curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBMETALINK_LIBS@ @LIBCURL_LIBS@ +gnurl_LDADD = $(top_builddir)/lib/libgnurl.la @LIBMETALINK_LIBS@ @LIBCURL_LIBS@ else -curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@ +gnurl_LDADD = $(top_builddir)/lib/libgnurl.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@ endif -curl_LDFLAGS = @LIBMETALINK_LDFLAGS@ -curl_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS) +gnurl_LDFLAGS = @LIBMETALINK_LDFLAGS@ +gnurl_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS) @CODE_COVERAGE_RULES@ -curl_LDFLAGS += $(CODE_COVERAGE_LDFLAGS) +gnurl_LDFLAGS += $(CODE_COVERAGE_LDFLAGS) CFLAGS += $(CODE_COVERAGE_CFLAGS) # if unit tests are enabled, build a static library to link them with @@ -80,7 +80,7 @@ libcurltool_la_CPPFLAGS = $(LIBMETALINK_CPPFLAGS) $(AM_CPPFLAGS) \ -DCURL_STATICLIB -DUNITTESTS libcurltool_la_CFLAGS = libcurltool_la_LDFLAGS = -static $(LINKFLAGS) -libcurltool_la_SOURCES = $(curl_SOURCES) +libcurltool_la_SOURCES = $(gnurl_SOURCES) endif CLEANFILES = tool_hugehelp.c @@ -94,7 +94,8 @@ EXTRA_DIST = mkhelp.pl makefile.dj Makefile.b32 \ curl.rc Makefile.netware Makefile.inc Makefile.Watcom CMakeLists.txt # Use absolute directory to disable VPATH -MANPAGE=$(abs_top_builddir)/docs/curl.1 +MANPAGE=$(abs_top_builddir)/docs/gnurl.1 + README=$(top_srcdir)/docs/MANUAL MKHELP=$(top_srcdir)/src/mkhelp.pl HUGE=tool_hugehelp.c diff --git a/src/Makefile.b32 b/src/Makefile.b32 index a60b3db74..6bcdcd700 100644 --- a/src/Makefile.b32 +++ b/src/Makefile.b32 @@ -72,9 +72,9 @@ LINKLIB = $(BCCDIR)\lib\cw32mt.lib $(BCCDIR)\lib\ws2_32.lib DEFINES = -DNDEBUG -DWIN32 !ifdef DYNAMIC -LIBCURL_LIB = ..\lib\libcurl_imp.lib +LIBCURL_LIB = ..\lib\libgnurl_imp.lib !else -LIBCURL_LIB = ..\lib\libcurl.lib +LIBCURL_LIB = ..\lib\libgnurl.lib DEFINES = $(DEFINES) -DCURL_STATICLIB !endif diff --git a/src/Makefile.m32 b/src/Makefile.m32 index 315cd5cb3..22e11e8e0 100644 --- a/src/Makefile.m32 +++ b/src/Makefile.m32 @@ -208,11 +208,11 @@ endif INCLUDES = -I. -I../include -I../lib ifdef DYN - curl_DEPENDENCIES = $(PROOT)/lib/libcurldll.a $(PROOT)/lib/libcurl.dll - curl_LDADD = -L$(PROOT)/lib -lcurldll + curl_DEPENDENCIES = $(PROOT)/lib/libgnurldll.a $(PROOT)/lib/libgnurl.dll + curl_LDADD = -L$(PROOT)/lib -lgnurldll else - curl_DEPENDENCIES = $(PROOT)/lib/libcurl.a - curl_LDADD = -L$(PROOT)/lib -lcurl + curl_DEPENDENCIES = $(PROOT)/lib/libgnurl.a + curl_LDADD = -L$(PROOT)/lib -lgnurl CFLAGS += -DCURL_STATICLIB LDFLAGS += -static endif diff --git a/src/Makefile.netware b/src/Makefile.netware index a927da592..b4d0d6901 100644 --- a/src/Makefile.netware +++ b/src/Makefile.netware @@ -265,13 +265,13 @@ ENABLE_IPV6 = 1 endif ifdef LINK_STATIC - LDLIBS = $(CURL_LIB)/libcurl.$(LIBEXT) + LDLIBS = $(CURL_LIB)/libgnurl.$(LIBEXT) ifdef WITH_ARES LDLIBS += $(LIBCARES_PATH)/libcares.$(LIBEXT) endif else - MODULES = libcurl.nlm - IMPORTS = @$(CURL_LIB)/libcurl.imp + MODULES = libgnurl.nlm + IMPORTS = @$(CURL_LIB)/libgnurl.imp endif ifdef WITH_SSH2 # INCLUDES += -I$(LIBSSH2_PATH)/include |