mirror of https://github.com/aria2/aria2
2009-06-07 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Compile bencode.cc and BencodeTest.cc only if BitTorrent support is enabled. * src/Makefile.am * test/Makefile.ampull/1/head
Tatsuhiro Tsujikawa
parent
b922020985
commit
c42cea4bcd
|
|
@ -1,3 +1,10 @@
|
||||||
|
2009-06-07 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
|
||||||
|
|
||||||
|
Compile bencode.cc and BencodeTest.cc only if BitTorrent support
|
||||||
|
is enabled.
|
||||||
|
* src/Makefile.am
|
||||||
|
* test/Makefile.am
|
||||||
|
|
||||||
2009-06-07 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
|
2009-06-07 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
|
||||||
|
|
||||||
Added countSeeder() function which counts seeder in the given
|
Added countSeeder() function which counts seeder in the given
|
||||||
|
|
|
||||||
|
|
@ -193,7 +193,6 @@ SRCS = Socket.h\
|
||||||
CookieStorage.cc CookieStorage.h\
|
CookieStorage.cc CookieStorage.h\
|
||||||
SocketBuffer.cc SocketBuffer.h\
|
SocketBuffer.cc SocketBuffer.h\
|
||||||
OptionHandlerException.cc OptionHandlerException.h\
|
OptionHandlerException.cc OptionHandlerException.h\
|
||||||
bencode.cc bencode.h\
|
|
||||||
URIResult.cc URIResult.h\
|
URIResult.cc URIResult.h\
|
||||||
EventPoll.h\
|
EventPoll.h\
|
||||||
SelectEventPoll.cc SelectEventPoll.h\
|
SelectEventPoll.cc SelectEventPoll.h\
|
||||||
|
|
@ -435,7 +434,8 @@ SRCS += PeerMessageUtil.cc PeerMessageUtil.h\
|
||||||
ZeroBtMessage.cc ZeroBtMessage.h\
|
ZeroBtMessage.cc ZeroBtMessage.h\
|
||||||
RangeBtMessageValidator.h\
|
RangeBtMessageValidator.h\
|
||||||
IndexBtMessageValidator.h\
|
IndexBtMessageValidator.h\
|
||||||
ExtensionMessageRegistry.h
|
ExtensionMessageRegistry.h\
|
||||||
|
bencode.cc bencode.h
|
||||||
endif # ENABLE_BITTORRENT
|
endif # ENABLE_BITTORRENT
|
||||||
|
|
||||||
if ENABLE_METALINK
|
if ENABLE_METALINK
|
||||||
|
|
|
||||||
|
|
@ -230,7 +230,8 @@ bin_PROGRAMS = aria2c$(EXEEXT)
|
||||||
@ENABLE_BITTORRENT_TRUE@ ZeroBtMessage.cc ZeroBtMessage.h\
|
@ENABLE_BITTORRENT_TRUE@ ZeroBtMessage.cc ZeroBtMessage.h\
|
||||||
@ENABLE_BITTORRENT_TRUE@ RangeBtMessageValidator.h\
|
@ENABLE_BITTORRENT_TRUE@ RangeBtMessageValidator.h\
|
||||||
@ENABLE_BITTORRENT_TRUE@ IndexBtMessageValidator.h\
|
@ENABLE_BITTORRENT_TRUE@ IndexBtMessageValidator.h\
|
||||||
@ENABLE_BITTORRENT_TRUE@ ExtensionMessageRegistry.h
|
@ENABLE_BITTORRENT_TRUE@ ExtensionMessageRegistry.h\
|
||||||
|
@ENABLE_BITTORRENT_TRUE@ bencode.cc bencode.h
|
||||||
|
|
||||||
@ENABLE_METALINK_TRUE@am__append_14 = Metalinker.cc Metalinker.h\
|
@ENABLE_METALINK_TRUE@am__append_14 = Metalinker.cc Metalinker.h\
|
||||||
@ENABLE_METALINK_TRUE@ MetalinkEntry.cc MetalinkEntry.h\
|
@ENABLE_METALINK_TRUE@ MetalinkEntry.cc MetalinkEntry.h\
|
||||||
|
|
@ -420,12 +421,11 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
|
||||||
FeedbackURISelector.h NsCookieParser.cc NsCookieParser.h \
|
FeedbackURISelector.h NsCookieParser.cc NsCookieParser.h \
|
||||||
CookieStorage.cc CookieStorage.h SocketBuffer.cc \
|
CookieStorage.cc CookieStorage.h SocketBuffer.cc \
|
||||||
SocketBuffer.h OptionHandlerException.cc \
|
SocketBuffer.h OptionHandlerException.cc \
|
||||||
OptionHandlerException.h bencode.cc bencode.h URIResult.cc \
|
OptionHandlerException.h URIResult.cc URIResult.h EventPoll.h \
|
||||||
URIResult.h EventPoll.h SelectEventPoll.cc SelectEventPoll.h \
|
SelectEventPoll.cc SelectEventPoll.h SequentialPicker.h \
|
||||||
SequentialPicker.h SequentialDispatcherCommand.h \
|
SequentialDispatcherCommand.h PieceSelector.h \
|
||||||
PieceSelector.h LongestSequencePieceSelector.cc \
|
LongestSequencePieceSelector.cc LongestSequencePieceSelector.h \
|
||||||
LongestSequencePieceSelector.h bitfield.h BDE.cc BDE.h \
|
bitfield.h BDE.cc BDE.h XmlRpcRequestParserController.cc \
|
||||||
XmlRpcRequestParserController.cc \
|
|
||||||
XmlRpcRequestParserController.h \
|
XmlRpcRequestParserController.h \
|
||||||
XmlRpcRequestParserStateMachine.cc \
|
XmlRpcRequestParserStateMachine.cc \
|
||||||
XmlRpcRequestParserStateMachine.h XmlRpcRequestParserState.h \
|
XmlRpcRequestParserStateMachine.h XmlRpcRequestParserState.h \
|
||||||
|
|
@ -563,8 +563,9 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
|
||||||
IndexBtMessage.cc IndexBtMessage.h ZeroBtMessage.cc \
|
IndexBtMessage.cc IndexBtMessage.h ZeroBtMessage.cc \
|
||||||
ZeroBtMessage.h RangeBtMessageValidator.h \
|
ZeroBtMessage.h RangeBtMessageValidator.h \
|
||||||
IndexBtMessageValidator.h ExtensionMessageRegistry.h \
|
IndexBtMessageValidator.h ExtensionMessageRegistry.h \
|
||||||
Metalinker.cc Metalinker.h MetalinkEntry.cc MetalinkEntry.h \
|
bencode.cc bencode.h Metalinker.cc Metalinker.h \
|
||||||
MetalinkResource.cc MetalinkResource.h MetalinkProcessor.h \
|
MetalinkEntry.cc MetalinkEntry.h MetalinkResource.cc \
|
||||||
|
MetalinkResource.h MetalinkProcessor.h \
|
||||||
MetalinkParserController.cc MetalinkParserController.h \
|
MetalinkParserController.cc MetalinkParserController.h \
|
||||||
MetalinkParserStateMachine.cc MetalinkParserStateMachine.h \
|
MetalinkParserStateMachine.cc MetalinkParserStateMachine.h \
|
||||||
MetalinkParserState.h InitialMetalinkParserState.cc \
|
MetalinkParserState.h InitialMetalinkParserState.cc \
|
||||||
|
|
@ -731,7 +732,8 @@ am__objects_6 =
|
||||||
@ENABLE_BITTORRENT_TRUE@ BtSeederStateChoke.$(OBJEXT) \
|
@ENABLE_BITTORRENT_TRUE@ BtSeederStateChoke.$(OBJEXT) \
|
||||||
@ENABLE_BITTORRENT_TRUE@ RangeBtMessage.$(OBJEXT) \
|
@ENABLE_BITTORRENT_TRUE@ RangeBtMessage.$(OBJEXT) \
|
||||||
@ENABLE_BITTORRENT_TRUE@ IndexBtMessage.$(OBJEXT) \
|
@ENABLE_BITTORRENT_TRUE@ IndexBtMessage.$(OBJEXT) \
|
||||||
@ENABLE_BITTORRENT_TRUE@ ZeroBtMessage.$(OBJEXT)
|
@ENABLE_BITTORRENT_TRUE@ ZeroBtMessage.$(OBJEXT) \
|
||||||
|
@ENABLE_BITTORRENT_TRUE@ bencode.$(OBJEXT)
|
||||||
@ENABLE_METALINK_TRUE@am__objects_14 = Metalinker.$(OBJEXT) \
|
@ENABLE_METALINK_TRUE@am__objects_14 = Metalinker.$(OBJEXT) \
|
||||||
@ENABLE_METALINK_TRUE@ MetalinkEntry.$(OBJEXT) \
|
@ENABLE_METALINK_TRUE@ MetalinkEntry.$(OBJEXT) \
|
||||||
@ENABLE_METALINK_TRUE@ MetalinkResource.$(OBJEXT) \
|
@ENABLE_METALINK_TRUE@ MetalinkResource.$(OBJEXT) \
|
||||||
|
|
@ -842,8 +844,7 @@ am__objects_26 = SocketCore.$(OBJEXT) Command.$(OBJEXT) \
|
||||||
InOrderURISelector.$(OBJEXT) FeedbackURISelector.$(OBJEXT) \
|
InOrderURISelector.$(OBJEXT) FeedbackURISelector.$(OBJEXT) \
|
||||||
NsCookieParser.$(OBJEXT) CookieStorage.$(OBJEXT) \
|
NsCookieParser.$(OBJEXT) CookieStorage.$(OBJEXT) \
|
||||||
SocketBuffer.$(OBJEXT) OptionHandlerException.$(OBJEXT) \
|
SocketBuffer.$(OBJEXT) OptionHandlerException.$(OBJEXT) \
|
||||||
bencode.$(OBJEXT) URIResult.$(OBJEXT) \
|
URIResult.$(OBJEXT) SelectEventPoll.$(OBJEXT) \
|
||||||
SelectEventPoll.$(OBJEXT) \
|
|
||||||
LongestSequencePieceSelector.$(OBJEXT) BDE.$(OBJEXT) \
|
LongestSequencePieceSelector.$(OBJEXT) BDE.$(OBJEXT) \
|
||||||
$(am__objects_1) $(am__objects_2) $(am__objects_3) \
|
$(am__objects_1) $(am__objects_2) $(am__objects_3) \
|
||||||
$(am__objects_4) $(am__objects_5) $(am__objects_6) \
|
$(am__objects_4) $(am__objects_5) $(am__objects_6) \
|
||||||
|
|
@ -1176,20 +1177,19 @@ SRCS = Socket.h SocketCore.cc SocketCore.h BinaryStream.h Command.cc \
|
||||||
FeedbackURISelector.h NsCookieParser.cc NsCookieParser.h \
|
FeedbackURISelector.h NsCookieParser.cc NsCookieParser.h \
|
||||||
CookieStorage.cc CookieStorage.h SocketBuffer.cc \
|
CookieStorage.cc CookieStorage.h SocketBuffer.cc \
|
||||||
SocketBuffer.h OptionHandlerException.cc \
|
SocketBuffer.h OptionHandlerException.cc \
|
||||||
OptionHandlerException.h bencode.cc bencode.h URIResult.cc \
|
OptionHandlerException.h URIResult.cc URIResult.h EventPoll.h \
|
||||||
URIResult.h EventPoll.h SelectEventPoll.cc SelectEventPoll.h \
|
SelectEventPoll.cc SelectEventPoll.h SequentialPicker.h \
|
||||||
SequentialPicker.h SequentialDispatcherCommand.h \
|
SequentialDispatcherCommand.h PieceSelector.h \
|
||||||
PieceSelector.h LongestSequencePieceSelector.cc \
|
LongestSequencePieceSelector.cc LongestSequencePieceSelector.h \
|
||||||
LongestSequencePieceSelector.h bitfield.h BDE.cc BDE.h \
|
bitfield.h BDE.cc BDE.h $(am__append_1) $(am__append_2) \
|
||||||
$(am__append_1) $(am__append_2) $(am__append_3) \
|
$(am__append_3) $(am__append_4) $(am__append_5) \
|
||||||
$(am__append_4) $(am__append_5) $(am__append_6) \
|
$(am__append_6) $(am__append_7) $(am__append_8) \
|
||||||
$(am__append_7) $(am__append_8) $(am__append_9) \
|
$(am__append_9) $(am__append_10) $(am__append_11) \
|
||||||
$(am__append_10) $(am__append_11) $(am__append_12) \
|
$(am__append_12) $(am__append_13) $(am__append_14) \
|
||||||
$(am__append_13) $(am__append_14) $(am__append_15) \
|
$(am__append_15) $(am__append_16) $(am__append_17) \
|
||||||
$(am__append_16) $(am__append_17) $(am__append_18) \
|
$(am__append_18) $(am__append_19) $(am__append_20) \
|
||||||
$(am__append_19) $(am__append_20) $(am__append_21) \
|
$(am__append_21) $(am__append_22) $(am__append_23) \
|
||||||
$(am__append_22) $(am__append_23) $(am__append_24) \
|
$(am__append_24) $(am__append_25)
|
||||||
$(am__append_25)
|
|
||||||
noinst_LIBRARIES = libaria2c.a
|
noinst_LIBRARIES = libaria2c.a
|
||||||
libaria2c_a_SOURCES = $(SRCS)
|
libaria2c_a_SOURCES = $(SRCS)
|
||||||
aria2c_LDADD = libaria2c.a @LIBINTL@ @ALLOCA@ @LIBGNUTLS_LIBS@\
|
aria2c_LDADD = libaria2c.a @LIBINTL@ @ALLOCA@ @LIBGNUTLS_LIBS@\
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,6 @@ aria2c_SOURCES = AllTest.cc\
|
||||||
OptionParserTest.cc\
|
OptionParserTest.cc\
|
||||||
SimpleDNSCacheTest.cc\
|
SimpleDNSCacheTest.cc\
|
||||||
DownloadHelperTest.cc\
|
DownloadHelperTest.cc\
|
||||||
BencodeTest.cc\
|
|
||||||
SequentialPickerTest.cc\
|
SequentialPickerTest.cc\
|
||||||
RarestPieceSelectorTest.cc\
|
RarestPieceSelectorTest.cc\
|
||||||
PieceStatManTest.cc\
|
PieceStatManTest.cc\
|
||||||
|
|
@ -182,7 +181,8 @@ aria2c_SOURCES += BtAllowedFastMessageTest.cc\
|
||||||
MockDHTTaskQueue.h\
|
MockDHTTaskQueue.h\
|
||||||
MockExtensionMessage.h\
|
MockExtensionMessage.h\
|
||||||
MockExtensionMessageFactory.h\
|
MockExtensionMessageFactory.h\
|
||||||
MockPieceStorage.h
|
MockPieceStorage.h\
|
||||||
|
BencodeTest.cc
|
||||||
endif # ENABLE_BITTORRENT
|
endif # ENABLE_BITTORRENT
|
||||||
|
|
||||||
if ENABLE_METALINK
|
if ENABLE_METALINK
|
||||||
|
|
|
||||||
|
|
@ -129,7 +129,8 @@ check_PROGRAMS = $(am__EXEEXT_1)
|
||||||
@ENABLE_BITTORRENT_TRUE@ MockDHTTaskQueue.h\
|
@ENABLE_BITTORRENT_TRUE@ MockDHTTaskQueue.h\
|
||||||
@ENABLE_BITTORRENT_TRUE@ MockExtensionMessage.h\
|
@ENABLE_BITTORRENT_TRUE@ MockExtensionMessage.h\
|
||||||
@ENABLE_BITTORRENT_TRUE@ MockExtensionMessageFactory.h\
|
@ENABLE_BITTORRENT_TRUE@ MockExtensionMessageFactory.h\
|
||||||
@ENABLE_BITTORRENT_TRUE@ MockPieceStorage.h
|
@ENABLE_BITTORRENT_TRUE@ MockPieceStorage.h\
|
||||||
|
@ENABLE_BITTORRENT_TRUE@ BencodeTest.cc
|
||||||
|
|
||||||
@ENABLE_METALINK_TRUE@am__append_7 = MetalinkerTest.cc\
|
@ENABLE_METALINK_TRUE@am__append_7 = MetalinkerTest.cc\
|
||||||
@ENABLE_METALINK_TRUE@ MetalinkEntryTest.cc\
|
@ENABLE_METALINK_TRUE@ MetalinkEntryTest.cc\
|
||||||
|
|
@ -195,7 +196,7 @@ am__aria2c_SOURCES_DIST = AllTest.cc TestUtil.cc TestUtil.h \
|
||||||
ServerStatTest.cc NsCookieParserTest.cc \
|
ServerStatTest.cc NsCookieParserTest.cc \
|
||||||
DirectDiskAdaptorTest.cc CookieTest.cc CookieStorageTest.cc \
|
DirectDiskAdaptorTest.cc CookieTest.cc CookieStorageTest.cc \
|
||||||
TimeTest.cc FtpConnectionTest.cc OptionParserTest.cc \
|
TimeTest.cc FtpConnectionTest.cc OptionParserTest.cc \
|
||||||
SimpleDNSCacheTest.cc DownloadHelperTest.cc BencodeTest.cc \
|
SimpleDNSCacheTest.cc DownloadHelperTest.cc \
|
||||||
SequentialPickerTest.cc RarestPieceSelectorTest.cc \
|
SequentialPickerTest.cc RarestPieceSelectorTest.cc \
|
||||||
PieceStatManTest.cc InOrderPieceSelector.h \
|
PieceStatManTest.cc InOrderPieceSelector.h \
|
||||||
LongestSequencePieceSelectorTest.cc a2algoTest.cc \
|
LongestSequencePieceSelectorTest.cc a2algoTest.cc \
|
||||||
|
|
@ -247,7 +248,7 @@ am__aria2c_SOURCES_DIST = AllTest.cc TestUtil.cc TestUtil.h \
|
||||||
MockDHTMessageFactory.h MockDHTTask.h MockDHTTaskFactory.h \
|
MockDHTMessageFactory.h MockDHTTask.h MockDHTTaskFactory.h \
|
||||||
MockDHTTaskQueue.h MockExtensionMessage.h \
|
MockDHTTaskQueue.h MockExtensionMessage.h \
|
||||||
MockExtensionMessageFactory.h MockPieceStorage.h \
|
MockExtensionMessageFactory.h MockPieceStorage.h \
|
||||||
MetalinkerTest.cc MetalinkEntryTest.cc \
|
BencodeTest.cc MetalinkerTest.cc MetalinkEntryTest.cc \
|
||||||
Metalink2RequestGroupTest.cc \
|
Metalink2RequestGroupTest.cc \
|
||||||
MetalinkPostDownloadHandlerTest.cc MetalinkHelperTest.cc \
|
MetalinkPostDownloadHandlerTest.cc MetalinkHelperTest.cc \
|
||||||
MetalinkParserControllerTest.cc MetalinkProcessorTest.cc
|
MetalinkParserControllerTest.cc MetalinkProcessorTest.cc
|
||||||
|
|
@ -329,7 +330,8 @@ am__aria2c_SOURCES_DIST = AllTest.cc TestUtil.cc TestUtil.h \
|
||||||
@ENABLE_BITTORRENT_TRUE@ DHKeyExchangeTest.$(OBJEXT) \
|
@ENABLE_BITTORRENT_TRUE@ DHKeyExchangeTest.$(OBJEXT) \
|
||||||
@ENABLE_BITTORRENT_TRUE@ ARC4Test.$(OBJEXT) \
|
@ENABLE_BITTORRENT_TRUE@ ARC4Test.$(OBJEXT) \
|
||||||
@ENABLE_BITTORRENT_TRUE@ MSEHandshakeTest.$(OBJEXT) \
|
@ENABLE_BITTORRENT_TRUE@ MSEHandshakeTest.$(OBJEXT) \
|
||||||
@ENABLE_BITTORRENT_TRUE@ DHTUtilTest.$(OBJEXT)
|
@ENABLE_BITTORRENT_TRUE@ DHTUtilTest.$(OBJEXT) \
|
||||||
|
@ENABLE_BITTORRENT_TRUE@ BencodeTest.$(OBJEXT)
|
||||||
@ENABLE_METALINK_TRUE@am__objects_7 = MetalinkerTest.$(OBJEXT) \
|
@ENABLE_METALINK_TRUE@am__objects_7 = MetalinkerTest.$(OBJEXT) \
|
||||||
@ENABLE_METALINK_TRUE@ MetalinkEntryTest.$(OBJEXT) \
|
@ENABLE_METALINK_TRUE@ MetalinkEntryTest.$(OBJEXT) \
|
||||||
@ENABLE_METALINK_TRUE@ Metalink2RequestGroupTest.$(OBJEXT) \
|
@ENABLE_METALINK_TRUE@ Metalink2RequestGroupTest.$(OBJEXT) \
|
||||||
|
|
@ -371,8 +373,7 @@ am_aria2c_OBJECTS = AllTest.$(OBJEXT) TestUtil.$(OBJEXT) \
|
||||||
CookieTest.$(OBJEXT) CookieStorageTest.$(OBJEXT) \
|
CookieTest.$(OBJEXT) CookieStorageTest.$(OBJEXT) \
|
||||||
TimeTest.$(OBJEXT) FtpConnectionTest.$(OBJEXT) \
|
TimeTest.$(OBJEXT) FtpConnectionTest.$(OBJEXT) \
|
||||||
OptionParserTest.$(OBJEXT) SimpleDNSCacheTest.$(OBJEXT) \
|
OptionParserTest.$(OBJEXT) SimpleDNSCacheTest.$(OBJEXT) \
|
||||||
DownloadHelperTest.$(OBJEXT) BencodeTest.$(OBJEXT) \
|
DownloadHelperTest.$(OBJEXT) SequentialPickerTest.$(OBJEXT) \
|
||||||
SequentialPickerTest.$(OBJEXT) \
|
|
||||||
RarestPieceSelectorTest.$(OBJEXT) PieceStatManTest.$(OBJEXT) \
|
RarestPieceSelectorTest.$(OBJEXT) PieceStatManTest.$(OBJEXT) \
|
||||||
LongestSequencePieceSelectorTest.$(OBJEXT) \
|
LongestSequencePieceSelectorTest.$(OBJEXT) \
|
||||||
a2algoTest.$(OBJEXT) bitfieldTest.$(OBJEXT) BDETest.$(OBJEXT) \
|
a2algoTest.$(OBJEXT) bitfieldTest.$(OBJEXT) BDETest.$(OBJEXT) \
|
||||||
|
|
@ -602,7 +603,7 @@ aria2c_SOURCES = AllTest.cc TestUtil.cc TestUtil.h SocketCoreTest.cc \
|
||||||
ServerStatTest.cc NsCookieParserTest.cc \
|
ServerStatTest.cc NsCookieParserTest.cc \
|
||||||
DirectDiskAdaptorTest.cc CookieTest.cc CookieStorageTest.cc \
|
DirectDiskAdaptorTest.cc CookieTest.cc CookieStorageTest.cc \
|
||||||
TimeTest.cc FtpConnectionTest.cc OptionParserTest.cc \
|
TimeTest.cc FtpConnectionTest.cc OptionParserTest.cc \
|
||||||
SimpleDNSCacheTest.cc DownloadHelperTest.cc BencodeTest.cc \
|
SimpleDNSCacheTest.cc DownloadHelperTest.cc \
|
||||||
SequentialPickerTest.cc RarestPieceSelectorTest.cc \
|
SequentialPickerTest.cc RarestPieceSelectorTest.cc \
|
||||||
PieceStatManTest.cc InOrderPieceSelector.h \
|
PieceStatManTest.cc InOrderPieceSelector.h \
|
||||||
LongestSequencePieceSelectorTest.cc a2algoTest.cc \
|
LongestSequencePieceSelectorTest.cc a2algoTest.cc \
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue