From d67f4cefac8cb19d49c86a54b7c2fa5f645fc783 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Thu, 1 Apr 2010 09:13:10 +0000 Subject: [PATCH] 2010-04-01 Tatsuhiro Tsujikawa Added download_helper.{cc,h} to SRCS * src/Makefile.am * test/Makefile.am --- ChangeLog | 6 ++++++ src/Makefile.am | 6 +++--- src/Makefile.in | 45 +++++++++++++++++++++++---------------------- test/Makefile.am | 2 +- test/Makefile.in | 5 ++--- 5 files changed, 35 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a70b148..cab297d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-04-01 Tatsuhiro Tsujikawa + + Added download_helper.{cc,h} to SRCS + * src/Makefile.am + * test/Makefile.am + 2010-03-30 Tatsuhiro Tsujikawa Added --dht-message-timeout option. diff --git a/src/Makefile.am b/src/Makefile.am index 095be686..b77f82e8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,8 +1,7 @@ bin_PROGRAMS = aria2c aria2c_SOURCES = main.cc\ option_processing.cc\ - version_usage.cc\ - download_helper.cc download_helper.h + version_usage.cc SRCS = Socket.h\ SocketCore.cc SocketCore.h\ BinaryStream.h\ @@ -198,7 +197,8 @@ SRCS = Socket.h\ BDE.cc BDE.h\ CreateRequestCommand.cc CreateRequestCommand.h\ DownloadResultCode.h\ - wallclock.h + wallclock.h\ + download_helper.cc download_helper.h if ENABLE_XML_RPC SRCS += XmlRpcRequestParserController.cc XmlRpcRequestParserController.h\ diff --git a/src/Makefile.in b/src/Makefile.in index 60d8a1f0..c2e33782 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -429,6 +429,7 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \ LongestSequencePieceSelector.cc LongestSequencePieceSelector.h \ bitfield.cc bitfield.h BDE.cc BDE.h CreateRequestCommand.cc \ CreateRequestCommand.h DownloadResultCode.h wallclock.h \ + download_helper.cc download_helper.h \ XmlRpcRequestParserController.cc \ XmlRpcRequestParserController.h \ XmlRpcRequestParserStateMachine.cc \ @@ -853,22 +854,22 @@ am__objects_27 = SocketCore.$(OBJEXT) Command.$(OBJEXT) \ SocketBuffer.$(OBJEXT) OptionHandlerException.$(OBJEXT) \ URIResult.$(OBJEXT) SelectEventPoll.$(OBJEXT) \ LongestSequencePieceSelector.$(OBJEXT) bitfield.$(OBJEXT) \ - BDE.$(OBJEXT) CreateRequestCommand.$(OBJEXT) $(am__objects_1) \ - $(am__objects_2) $(am__objects_3) $(am__objects_4) \ - $(am__objects_5) $(am__objects_6) $(am__objects_7) \ - $(am__objects_8) $(am__objects_9) $(am__objects_10) \ - $(am__objects_11) $(am__objects_12) $(am__objects_13) \ - $(am__objects_14) $(am__objects_15) $(am__objects_16) \ - $(am__objects_17) $(am__objects_18) $(am__objects_19) \ - $(am__objects_20) $(am__objects_21) $(am__objects_22) \ - $(am__objects_23) $(am__objects_24) $(am__objects_25) \ - $(am__objects_26) + BDE.$(OBJEXT) CreateRequestCommand.$(OBJEXT) \ + download_helper.$(OBJEXT) $(am__objects_1) $(am__objects_2) \ + $(am__objects_3) $(am__objects_4) $(am__objects_5) \ + $(am__objects_6) $(am__objects_7) $(am__objects_8) \ + $(am__objects_9) $(am__objects_10) $(am__objects_11) \ + $(am__objects_12) $(am__objects_13) $(am__objects_14) \ + $(am__objects_15) $(am__objects_16) $(am__objects_17) \ + $(am__objects_18) $(am__objects_19) $(am__objects_20) \ + $(am__objects_21) $(am__objects_22) $(am__objects_23) \ + $(am__objects_24) $(am__objects_25) $(am__objects_26) am_libaria2c_a_OBJECTS = $(am__objects_27) libaria2c_a_OBJECTS = $(am_libaria2c_a_OBJECTS) am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am_aria2c_OBJECTS = main.$(OBJEXT) option_processing.$(OBJEXT) \ - version_usage.$(OBJEXT) download_helper.$(OBJEXT) + version_usage.$(OBJEXT) aria2c_OBJECTS = $(am_aria2c_OBJECTS) aria2c_DEPENDENCIES = libaria2c.a @ALLOCA@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) @@ -1069,8 +1070,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ aria2c_SOURCES = main.cc\ option_processing.cc\ - version_usage.cc\ - download_helper.cc download_helper.h + version_usage.cc SRCS = Socket.h SocketCore.cc SocketCore.h BinaryStream.h Command.cc \ Command.h AbstractCommand.cc AbstractCommand.h \ @@ -1189,15 +1189,16 @@ SRCS = Socket.h SocketCore.cc SocketCore.h BinaryStream.h Command.cc \ LongestSequencePieceSelector.cc LongestSequencePieceSelector.h \ bitfield.cc bitfield.h BDE.cc BDE.h CreateRequestCommand.cc \ CreateRequestCommand.h DownloadResultCode.h wallclock.h \ - $(am__append_1) $(am__append_2) $(am__append_3) \ - $(am__append_4) $(am__append_5) $(am__append_6) \ - $(am__append_7) $(am__append_8) $(am__append_9) \ - $(am__append_10) $(am__append_11) $(am__append_12) \ - $(am__append_13) $(am__append_14) $(am__append_15) \ - $(am__append_16) $(am__append_17) $(am__append_18) \ - $(am__append_19) $(am__append_20) $(am__append_21) \ - $(am__append_22) $(am__append_23) $(am__append_24) \ - $(am__append_25) $(am__append_26) + download_helper.cc download_helper.h $(am__append_1) \ + $(am__append_2) $(am__append_3) $(am__append_4) \ + $(am__append_5) $(am__append_6) $(am__append_7) \ + $(am__append_8) $(am__append_9) $(am__append_10) \ + $(am__append_11) $(am__append_12) $(am__append_13) \ + $(am__append_14) $(am__append_15) $(am__append_16) \ + $(am__append_17) $(am__append_18) $(am__append_19) \ + $(am__append_20) $(am__append_21) $(am__append_22) \ + $(am__append_23) $(am__append_24) $(am__append_25) \ + $(am__append_26) noinst_LIBRARIES = libaria2c.a libaria2c_a_SOURCES = $(SRCS) aria2c_LDADD = libaria2c.a @LIBINTL@ @ALLOCA@ @LIBGNUTLS_LIBS@\ diff --git a/test/Makefile.am b/test/Makefile.am index 080e0915..df411531 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -209,7 +209,7 @@ endif # ENABLE_METALINK #aria2c_CXXFLAGS = ${CPPUNIT_CFLAGS} -I../src -I../lib -Wall -D_FILE_OFFSET_BITS=64 #aria2c_LDFLAGS = ${CPPUNIT_LIBS} -aria2c_LDADD = ../src/libaria2c.a ../src/download_helper.o\ +aria2c_LDADD = ../src/libaria2c.a\ @LIBINTL@ @LIBGNUTLS_LIBS@\ @LIBGCRYPT_LIBS@ @OPENSSL_LIBS@ @XML_LIBS@\ @LIBCARES_LIBS@ @WINSOCK_LIBS@ @LIBEXPAT_LIBS@ @LIBZ_LIBS@\ diff --git a/test/Makefile.in b/test/Makefile.in index b5a360e2..26777ae6 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -411,8 +411,7 @@ am_aria2c_OBJECTS = AllTest.$(OBJEXT) TestUtil.$(OBJEXT) \ $(am__objects_5) $(am__objects_6) $(am__objects_7) aria2c_OBJECTS = $(am_aria2c_OBJECTS) am__DEPENDENCIES_1 = -aria2c_DEPENDENCIES = ../src/libaria2c.a ../src/download_helper.o \ - $(am__DEPENDENCIES_1) +aria2c_DEPENDENCIES = ../src/libaria2c.a $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -646,7 +645,7 @@ aria2c_SOURCES = AllTest.cc TestUtil.cc TestUtil.h SocketCoreTest.cc \ #aria2c_CXXFLAGS = ${CPPUNIT_CFLAGS} -I../src -I../lib -Wall -D_FILE_OFFSET_BITS=64 #aria2c_LDFLAGS = ${CPPUNIT_LIBS} -aria2c_LDADD = ../src/libaria2c.a ../src/download_helper.o\ +aria2c_LDADD = ../src/libaria2c.a\ @LIBINTL@ @LIBGNUTLS_LIBS@\ @LIBGCRYPT_LIBS@ @OPENSSL_LIBS@ @XML_LIBS@\ @LIBCARES_LIBS@ @WINSOCK_LIBS@ @LIBEXPAT_LIBS@ @LIBZ_LIBS@\