diff options
| author | Christian Grothoff <christian@grothoff.org> | 2015-01-08 19:38:57 +0100 |
|---|---|---|
| committer | ng0 <ng0@no-reply.infotropique.org> | 2017-06-16 11:38:17 +0000 |
| commit | 86ecd25e8bccf3084c937bd558ba98663bf142c9 (patch) | |
| tree | 2e7fabfc7f8d7095b3443eade1878a27f7eda3e5 /src/Makefile.am | |
| parent | 54b636f14546d3fde9f9c67c3b32701d78563161 (diff) | |
| download | gnurl-7.54.1.tar.gz gnurl-7.54.1.tar.bz2 gnurl-7.54.1.zip | |
Patchset for gnURL microfork:gnurl-7.54.1gnurl-7_54_1
* Patches to rename libcurl to libgnurl by Christian
* Updated for latest curl using git cherry-pick by Jeff, Florian, ng0
* Patches to fix the testsuite (deleted tests/data/test1139, renamed
reference from libcurl.* to libgnurl.*) by ng0
* Added guix-gnurl.scm which can be used to build this with guix prior
to installing it. (author: ng0)
* Further adjustments by ng0
Signed-off-by: ng0 <ng0@no-reply.infotropique.org>
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 950a7ba22..aa1d399b5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -45,7 +45,7 @@ AM_CPPFLAGS = -I$(top_builddir)/include/curl \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/src -bin_PROGRAMS = curl +bin_PROGRAMS = gnurl if USE_CPPFLAG_CURL_STATICLIB AM_CPPFLAGS += -DCURL_STATICLIB @@ -54,7 +54,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@ @@ -63,16 +63,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 @@ -82,7 +82,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 BUILT_SOURCES = tool_hugehelp.c @@ -97,7 +97,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 |