diff options
| author | Christian Grothoff <christian@grothoff.org> | 2015-01-08 19:38:57 +0100 |
|---|---|---|
| committer | Jeff Burdges <burdges@gnunet.org> | 2015-08-03 23:34:45 +0200 |
| commit | 6ec004b727a65917c0ea5378a0b5a7a5368007d9 (patch) | |
| tree | 437fe74e47058908583b89cf90e0c154df67d690 /src/Makefile.am | |
| parent | 38e07886ed2792988217a2ffa482ce3a69ca92c2 (diff) | |
| download | gnurl-6ec004b727a65917c0ea5378a0b5a7a5368007d9.tar.gz gnurl-6ec004b727a65917c0ea5378a0b5a7a5368007d9.tar.bz2 gnurl-6ec004b727a65917c0ea5378a0b5a7a5368007d9.zip | |
Patches to rename libcurl to libgnurl by Christiangnurl-7_43_0
Updated for latest curl using git cherry-pick by Jeff
Conflicts:
Makefile.am
configure.ac
docs/gnurl.1
src/Makefile.am
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index f4bc6c9a2..b6501b287 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 @@ -60,14 +60,14 @@ 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) -curl_DEPENDENCIES = $(top_builddir)/lib/libcurl.la +gnurl_LDFLAGS = @LIBMETALINK_LDFLAGS@ +gnurl_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS) +gnurl_DEPENDENCIES = $(top_builddir)/lib/libgnurl.la # if unit tests are enabled, build a static library to link them with if BUILD_UNITTESTS @@ -75,7 +75,7 @@ noinst_LTLIBRARIES = libcurltool.la libcurltool_la_CPPFLAGS = $(LIBMETALINK_CPPFLAGS) $(AM_CPPFLAGS) libcurltool_la_CFLAGS = -DUNITTESTS libcurltool_la_LDFLAGS = -static $(LINKFLAGS) -libcurltool_la_SOURCES = $(curl_SOURCES) +libcurltool_la_SOURCES = $(gnurl_SOURCES) endif BUILT_SOURCES = tool_hugehelp.c @@ -90,7 +90,7 @@ EXTRA_DIST = mkhelp.pl makefile.dj Makefile.vc6 Makefile.b32 \ curl.rc Makefile.netware Makefile.inc Makefile.Watcom CMakeLists.txt \ checksrc.whitelist -MANPAGE=$(top_srcdir)/docs/curl.1 +MANPAGE=$(top_srcdir)/docs/gnurl.1 README=$(top_srcdir)/docs/MANUAL MKHELP=$(top_srcdir)/src/mkhelp.pl HUGE=tool_hugehelp.c |