X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FMakefile.in;h=bd25887bc853d1fba898e684e395b4cb17452e81;hb=24b9957402f17c422eeeb3386bf049feeb342e78;hp=ac71cdfb4916d1a4805d9efa90fdfe8138d152ac;hpb=88d478478059f53e6de0d1267c3a1e6b02c4273f;p=platform%2Fupstream%2Fcurl.git diff --git a/src/Makefile.in b/src/Makefile.in index ac71cdf..bd25887 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -140,18 +140,18 @@ am__libcurltool_la_SOURCES_DIST = slist_wc.c tool_binmode.c \ tool_parsecfg.c tool_strdup.c tool_setopt.c tool_sleep.c \ tool_urlglob.c tool_util.c tool_vms.c tool_writeenv.c \ tool_writeout.c tool_xattr.c ../lib/strtoofft.c \ - ../lib/rawstr.c ../lib/nonblock.c ../lib/warnless.c slist_wc.h \ - tool_binmode.h tool_bname.h tool_cb_dbg.h tool_cb_hdr.h \ - tool_cb_prg.h tool_cb_rea.h tool_cb_see.h tool_cb_wrt.h \ - tool_cfgable.h tool_convert.h tool_dirhie.h tool_doswin.h \ - tool_easysrc.h tool_formparse.h tool_getparam.h tool_getpass.h \ - tool_help.h tool_helpers.h tool_homedir.h tool_hugehelp.h \ - tool_libinfo.h tool_main.h tool_metalink.h tool_mfiles.h \ - tool_msgs.h tool_operate.h tool_operhlp.h tool_panykey.h \ - tool_paramhlp.h tool_parsecfg.h tool_sdecls.h tool_setopt.h \ - tool_setup.h tool_sleep.h tool_strdup.h tool_urlglob.h \ - tool_util.h tool_version.h tool_vms.h tool_writeenv.h \ - tool_writeout.h tool_xattr.h + ../lib/nonblock.c ../lib/warnless.c slist_wc.h tool_binmode.h \ + tool_bname.h tool_cb_dbg.h tool_cb_hdr.h tool_cb_prg.h \ + tool_cb_rea.h tool_cb_see.h tool_cb_wrt.h tool_cfgable.h \ + tool_convert.h tool_dirhie.h tool_doswin.h tool_easysrc.h \ + tool_formparse.h tool_getparam.h tool_getpass.h tool_help.h \ + tool_helpers.h tool_homedir.h tool_hugehelp.h tool_libinfo.h \ + tool_main.h tool_metalink.h tool_mfiles.h tool_msgs.h \ + tool_operate.h tool_operhlp.h tool_panykey.h tool_paramhlp.h \ + tool_parsecfg.h tool_sdecls.h tool_setopt.h tool_setup.h \ + tool_sleep.h tool_strdup.h tool_urlglob.h tool_util.h \ + tool_version.h tool_vms.h tool_writeenv.h tool_writeout.h \ + tool_xattr.h am__objects_1 = libcurltool_la-slist_wc.lo \ libcurltool_la-tool_binmode.lo libcurltool_la-tool_bname.lo \ libcurltool_la-tool_cb_dbg.lo libcurltool_la-tool_cb_hdr.lo \ @@ -176,7 +176,6 @@ am__objects_1 = libcurltool_la-slist_wc.lo \ libcurltool_la-tool_writeout.lo libcurltool_la-tool_xattr.lo am__dirstamp = $(am__leading_dot)dirstamp am__objects_2 = ../lib/libcurltool_la-strtoofft.lo \ - ../lib/libcurltool_la-rawstr.lo \ ../lib/libcurltool_la-nonblock.lo \ ../lib/libcurltool_la-warnless.lo am__objects_3 = @@ -216,8 +215,7 @@ am__objects_6 = curl-slist_wc.$(OBJEXT) curl-tool_binmode.$(OBJEXT) \ curl-tool_vms.$(OBJEXT) curl-tool_writeenv.$(OBJEXT) \ curl-tool_writeout.$(OBJEXT) curl-tool_xattr.$(OBJEXT) am__objects_7 = ../lib/curl-strtoofft.$(OBJEXT) \ - ../lib/curl-rawstr.$(OBJEXT) ../lib/curl-nonblock.$(OBJEXT) \ - ../lib/curl-warnless.$(OBJEXT) + ../lib/curl-nonblock.$(OBJEXT) ../lib/curl-warnless.$(OBJEXT) am__objects_8 = $(am__objects_6) $(am__objects_7) $(am__objects_3) am_curl_OBJECTS = $(am__objects_8) curl_OBJECTS = $(am_curl_OBJECTS) @@ -491,7 +489,7 @@ top_srcdir = @top_srcdir@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2016, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2017, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -528,14 +526,12 @@ AM_CPPFLAGS = -I$(top_builddir)/include/curl -I$(top_builddir)/include \ # the official API, but we re-use the code here to avoid duplication. CURLX_CFILES = \ ../lib/strtoofft.c \ - ../lib/rawstr.c \ ../lib/nonblock.c \ ../lib/warnless.c CURLX_HFILES = \ ../lib/curl_setup.h \ ../lib/strtoofft.h \ - ../lib/rawstr.h \ ../lib/nonblock.h \ ../lib/warnless.h @@ -649,12 +645,12 @@ curl_DEPENDENCIES = $(top_builddir)/lib/libcurl.la @BUILD_UNITTESTS_TRUE@libcurltool_la_SOURCES = $(curl_SOURCES) BUILT_SOURCES = tool_hugehelp.c CLEANFILES = tool_hugehelp.c -EXTRA_DIST = mkhelp.pl makefile.dj Makefile.vc6 Makefile.b32 \ +EXTRA_DIST = mkhelp.pl makefile.dj Makefile.b32 \ Makefile.m32 macos/curl.mcp.xml.sit.hqx macos/MACINSTALL.TXT \ macos/src/curl_GUSIConfig.cpp macos/src/macos_main.cpp makefile.amiga \ curl.rc Makefile.netware Makefile.inc Makefile.Watcom CMakeLists.txt -MANPAGE = $(top_srcdir)/docs/curl.1 +MANPAGE = $(top_builddir)/docs/curl.1 README = $(top_srcdir)/docs/MANUAL MKHELP = $(top_srcdir)/src/mkhelp.pl HUGE = tool_hugehelp.c @@ -712,8 +708,6 @@ clean-noinstLTLIBRARIES: @: > ../lib/$(DEPDIR)/$(am__dirstamp) ../lib/libcurltool_la-strtoofft.lo: ../lib/$(am__dirstamp) \ ../lib/$(DEPDIR)/$(am__dirstamp) -../lib/libcurltool_la-rawstr.lo: ../lib/$(am__dirstamp) \ - ../lib/$(DEPDIR)/$(am__dirstamp) ../lib/libcurltool_la-nonblock.lo: ../lib/$(am__dirstamp) \ ../lib/$(DEPDIR)/$(am__dirstamp) ../lib/libcurltool_la-warnless.lo: ../lib/$(am__dirstamp) \ @@ -772,8 +766,6 @@ clean-binPROGRAMS: rm -f $$list ../lib/curl-strtoofft.$(OBJEXT): ../lib/$(am__dirstamp) \ ../lib/$(DEPDIR)/$(am__dirstamp) -../lib/curl-rawstr.$(OBJEXT): ../lib/$(am__dirstamp) \ - ../lib/$(DEPDIR)/$(am__dirstamp) ../lib/curl-nonblock.$(OBJEXT): ../lib/$(am__dirstamp) \ ../lib/$(DEPDIR)/$(am__dirstamp) ../lib/curl-warnless.$(OBJEXT): ../lib/$(am__dirstamp) \ @@ -792,11 +784,9 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@../lib/$(DEPDIR)/curl-nonblock.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@../lib/$(DEPDIR)/curl-rawstr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../lib/$(DEPDIR)/curl-strtoofft.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../lib/$(DEPDIR)/curl-warnless.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../lib/$(DEPDIR)/libcurltool_la-nonblock.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@../lib/$(DEPDIR)/libcurltool_la-rawstr.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../lib/$(DEPDIR)/libcurltool_la-strtoofft.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../lib/$(DEPDIR)/libcurltool_la-warnless.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curl-slist_wc.Po@am__quote@ @@ -1191,13 +1181,6 @@ libcurltool_la-tool_xattr.lo: tool_xattr.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcurltool_la_CPPFLAGS) $(CPPFLAGS) $(libcurltool_la_CFLAGS) $(CFLAGS) -c -o ../lib/libcurltool_la-strtoofft.lo `test -f '../lib/strtoofft.c' || echo '$(srcdir)/'`../lib/strtoofft.c -../lib/libcurltool_la-rawstr.lo: ../lib/rawstr.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcurltool_la_CPPFLAGS) $(CPPFLAGS) $(libcurltool_la_CFLAGS) $(CFLAGS) -MT ../lib/libcurltool_la-rawstr.lo -MD -MP -MF ../lib/$(DEPDIR)/libcurltool_la-rawstr.Tpo -c -o ../lib/libcurltool_la-rawstr.lo `test -f '../lib/rawstr.c' || echo '$(srcdir)/'`../lib/rawstr.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../lib/$(DEPDIR)/libcurltool_la-rawstr.Tpo ../lib/$(DEPDIR)/libcurltool_la-rawstr.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../lib/rawstr.c' object='../lib/libcurltool_la-rawstr.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcurltool_la_CPPFLAGS) $(CPPFLAGS) $(libcurltool_la_CFLAGS) $(CFLAGS) -c -o ../lib/libcurltool_la-rawstr.lo `test -f '../lib/rawstr.c' || echo '$(srcdir)/'`../lib/rawstr.c - ../lib/libcurltool_la-nonblock.lo: ../lib/nonblock.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcurltool_la_CPPFLAGS) $(CPPFLAGS) $(libcurltool_la_CFLAGS) $(CFLAGS) -MT ../lib/libcurltool_la-nonblock.lo -MD -MP -MF ../lib/$(DEPDIR)/libcurltool_la-nonblock.Tpo -c -o ../lib/libcurltool_la-nonblock.lo `test -f '../lib/nonblock.c' || echo '$(srcdir)/'`../lib/nonblock.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../lib/$(DEPDIR)/libcurltool_la-nonblock.Tpo ../lib/$(DEPDIR)/libcurltool_la-nonblock.Plo @@ -1786,20 +1769,6 @@ curl-tool_xattr.obj: tool_xattr.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(curl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../lib/curl-strtoofft.obj `if test -f '../lib/strtoofft.c'; then $(CYGPATH_W) '../lib/strtoofft.c'; else $(CYGPATH_W) '$(srcdir)/../lib/strtoofft.c'; fi` -../lib/curl-rawstr.o: ../lib/rawstr.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(curl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ../lib/curl-rawstr.o -MD -MP -MF ../lib/$(DEPDIR)/curl-rawstr.Tpo -c -o ../lib/curl-rawstr.o `test -f '../lib/rawstr.c' || echo '$(srcdir)/'`../lib/rawstr.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../lib/$(DEPDIR)/curl-rawstr.Tpo ../lib/$(DEPDIR)/curl-rawstr.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../lib/rawstr.c' object='../lib/curl-rawstr.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(curl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../lib/curl-rawstr.o `test -f '../lib/rawstr.c' || echo '$(srcdir)/'`../lib/rawstr.c - -../lib/curl-rawstr.obj: ../lib/rawstr.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(curl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ../lib/curl-rawstr.obj -MD -MP -MF ../lib/$(DEPDIR)/curl-rawstr.Tpo -c -o ../lib/curl-rawstr.obj `if test -f '../lib/rawstr.c'; then $(CYGPATH_W) '../lib/rawstr.c'; else $(CYGPATH_W) '$(srcdir)/../lib/rawstr.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../lib/$(DEPDIR)/curl-rawstr.Tpo ../lib/$(DEPDIR)/curl-rawstr.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../lib/rawstr.c' object='../lib/curl-rawstr.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(curl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../lib/curl-rawstr.obj `if test -f '../lib/rawstr.c'; then $(CYGPATH_W) '../lib/rawstr.c'; else $(CYGPATH_W) '$(srcdir)/../lib/rawstr.c'; fi` - ../lib/curl-nonblock.o: ../lib/nonblock.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(curl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ../lib/curl-nonblock.o -MD -MP -MF ../lib/$(DEPDIR)/curl-nonblock.Tpo -c -o ../lib/curl-nonblock.o `test -f '../lib/nonblock.c' || echo '$(srcdir)/'`../lib/nonblock.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../lib/$(DEPDIR)/curl-nonblock.Tpo ../lib/$(DEPDIR)/curl-nonblock.Po @@ -2057,6 +2026,9 @@ uninstall-am: uninstall-binPROGRAMS # Here are the stuff to create a built-in manual +@USE_MANUAL_TRUE@$(MANPAGE): +@USE_MANUAL_TRUE@ cd $(top_builddir)/docs && make curl.1 + # This generates the tool_hugehelp.c file in both uncompressed and # compressed formats @HAVE_LIBZ_TRUE@@USE_MANUAL_TRUE@$(HUGE): $(README) $(MANPAGE) mkhelp.pl