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

ChangeLog

@@ -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>
 
 	Added countSeeder() function which counts seeder in the given

src/Makefile.am

@@ -193,7 +193,6 @@ SRCS =  Socket.h\
 	CookieStorage.cc CookieStorage.h\
 	SocketBuffer.cc SocketBuffer.h\
 	OptionHandlerException.cc OptionHandlerException.h\
-	bencode.cc bencode.h\
 	URIResult.cc URIResult.h\
 	EventPoll.h\
 	SelectEventPoll.cc SelectEventPoll.h\
@@ -435,7 +434,8 @@ SRCS += PeerMessageUtil.cc PeerMessageUtil.h\
 	ZeroBtMessage.cc ZeroBtMessage.h\
 	RangeBtMessageValidator.h\
 	IndexBtMessageValidator.h\
-	ExtensionMessageRegistry.h
+	ExtensionMessageRegistry.h\
+	bencode.cc bencode.h
 endif # ENABLE_BITTORRENT
 
 if ENABLE_METALINK

src/Makefile.in

@@ -230,7 +230,8 @@ bin_PROGRAMS = aria2c$(EXEEXT)
 @ENABLE_BITTORRENT_TRUE@	ZeroBtMessage.cc ZeroBtMessage.h\
 @ENABLE_BITTORRENT_TRUE@	RangeBtMessageValidator.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@	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 \
 	CookieStorage.cc CookieStorage.h SocketBuffer.cc \
 	SocketBuffer.h OptionHandlerException.cc \
-	OptionHandlerException.h bencode.cc bencode.h URIResult.cc \
-	URIResult.h EventPoll.h SelectEventPoll.cc SelectEventPoll.h \
-	SequentialPicker.h SequentialDispatcherCommand.h \
-	PieceSelector.h LongestSequencePieceSelector.cc \
-	LongestSequencePieceSelector.h bitfield.h BDE.cc BDE.h \
-	XmlRpcRequestParserController.cc \
+	OptionHandlerException.h URIResult.cc URIResult.h EventPoll.h \
+	SelectEventPoll.cc SelectEventPoll.h SequentialPicker.h \
+	SequentialDispatcherCommand.h PieceSelector.h \
+	LongestSequencePieceSelector.cc LongestSequencePieceSelector.h \
+	bitfield.h BDE.cc BDE.h XmlRpcRequestParserController.cc \
 	XmlRpcRequestParserController.h \
 	XmlRpcRequestParserStateMachine.cc \
 	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 \
 	ZeroBtMessage.h RangeBtMessageValidator.h \
 	IndexBtMessageValidator.h ExtensionMessageRegistry.h \
-	Metalinker.cc Metalinker.h MetalinkEntry.cc MetalinkEntry.h \
-	MetalinkResource.cc MetalinkResource.h MetalinkProcessor.h \
+	bencode.cc bencode.h Metalinker.cc Metalinker.h \
+	MetalinkEntry.cc MetalinkEntry.h MetalinkResource.cc \
+	MetalinkResource.h MetalinkProcessor.h \
 	MetalinkParserController.cc MetalinkParserController.h \
 	MetalinkParserStateMachine.cc MetalinkParserStateMachine.h \
 	MetalinkParserState.h InitialMetalinkParserState.cc \
@@ -731,7 +732,8 @@ am__objects_6 =
 @ENABLE_BITTORRENT_TRUE@	BtSeederStateChoke.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	RangeBtMessage.$(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@	MetalinkEntry.$(OBJEXT) \
 @ENABLE_METALINK_TRUE@	MetalinkResource.$(OBJEXT) \
@@ -842,8 +844,7 @@ am__objects_26 = SocketCore.$(OBJEXT) Command.$(OBJEXT) \
 	InOrderURISelector.$(OBJEXT) FeedbackURISelector.$(OBJEXT) \
 	NsCookieParser.$(OBJEXT) CookieStorage.$(OBJEXT) \
 	SocketBuffer.$(OBJEXT) OptionHandlerException.$(OBJEXT) \
-	bencode.$(OBJEXT) URIResult.$(OBJEXT) \
-	SelectEventPoll.$(OBJEXT) \
+	URIResult.$(OBJEXT) SelectEventPoll.$(OBJEXT) \
 	LongestSequencePieceSelector.$(OBJEXT) BDE.$(OBJEXT) \
 	$(am__objects_1) $(am__objects_2) $(am__objects_3) \
 	$(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 \
 	CookieStorage.cc CookieStorage.h SocketBuffer.cc \
 	SocketBuffer.h OptionHandlerException.cc \
-	OptionHandlerException.h bencode.cc bencode.h URIResult.cc \
-	URIResult.h EventPoll.h SelectEventPoll.cc SelectEventPoll.h \
-	SequentialPicker.h SequentialDispatcherCommand.h \
-	PieceSelector.h LongestSequencePieceSelector.cc \
-	LongestSequencePieceSelector.h bitfield.h BDE.cc BDE.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)
+	OptionHandlerException.h URIResult.cc URIResult.h EventPoll.h \
+	SelectEventPoll.cc SelectEventPoll.h SequentialPicker.h \
+	SequentialDispatcherCommand.h PieceSelector.h \
+	LongestSequencePieceSelector.cc LongestSequencePieceSelector.h \
+	bitfield.h BDE.cc BDE.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)
 noinst_LIBRARIES = libaria2c.a
 libaria2c_a_SOURCES = $(SRCS)
 aria2c_LDADD = libaria2c.a @LIBINTL@ @ALLOCA@ @LIBGNUTLS_LIBS@\

test/Makefile.am

@@ -63,7 +63,6 @@ aria2c_SOURCES = AllTest.cc\
 	OptionParserTest.cc\
 	SimpleDNSCacheTest.cc\
 	DownloadHelperTest.cc\
-	BencodeTest.cc\
 	SequentialPickerTest.cc\
 	RarestPieceSelectorTest.cc\
 	PieceStatManTest.cc\
@@ -182,7 +181,8 @@ aria2c_SOURCES += BtAllowedFastMessageTest.cc\
 	MockDHTTaskQueue.h\
 	MockExtensionMessage.h\
 	MockExtensionMessageFactory.h\
-	MockPieceStorage.h
+	MockPieceStorage.h\
+	BencodeTest.cc
 endif # ENABLE_BITTORRENT
 
 if ENABLE_METALINK

test/Makefile.in

@@ -129,7 +129,8 @@ check_PROGRAMS = $(am__EXEEXT_1)
 @ENABLE_BITTORRENT_TRUE@	MockDHTTaskQueue.h\
 @ENABLE_BITTORRENT_TRUE@	MockExtensionMessage.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@	MetalinkEntryTest.cc\
@@ -195,7 +196,7 @@ am__aria2c_SOURCES_DIST = AllTest.cc TestUtil.cc TestUtil.h \
 	ServerStatTest.cc NsCookieParserTest.cc \
 	DirectDiskAdaptorTest.cc CookieTest.cc CookieStorageTest.cc \
 	TimeTest.cc FtpConnectionTest.cc OptionParserTest.cc \
-	SimpleDNSCacheTest.cc DownloadHelperTest.cc BencodeTest.cc \
+	SimpleDNSCacheTest.cc DownloadHelperTest.cc \
 	SequentialPickerTest.cc RarestPieceSelectorTest.cc \
 	PieceStatManTest.cc InOrderPieceSelector.h \
 	LongestSequencePieceSelectorTest.cc a2algoTest.cc \
@@ -247,7 +248,7 @@ am__aria2c_SOURCES_DIST = AllTest.cc TestUtil.cc TestUtil.h \
 	MockDHTMessageFactory.h MockDHTTask.h MockDHTTaskFactory.h \
 	MockDHTTaskQueue.h MockExtensionMessage.h \
 	MockExtensionMessageFactory.h MockPieceStorage.h \
-	MetalinkerTest.cc MetalinkEntryTest.cc \
+	BencodeTest.cc MetalinkerTest.cc MetalinkEntryTest.cc \
 	Metalink2RequestGroupTest.cc \
 	MetalinkPostDownloadHandlerTest.cc MetalinkHelperTest.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@	ARC4Test.$(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@	MetalinkEntryTest.$(OBJEXT) \
 @ENABLE_METALINK_TRUE@	Metalink2RequestGroupTest.$(OBJEXT) \
@@ -371,8 +373,7 @@ am_aria2c_OBJECTS = AllTest.$(OBJEXT) TestUtil.$(OBJEXT) \
 	CookieTest.$(OBJEXT) CookieStorageTest.$(OBJEXT) \
 	TimeTest.$(OBJEXT) FtpConnectionTest.$(OBJEXT) \
 	OptionParserTest.$(OBJEXT) SimpleDNSCacheTest.$(OBJEXT) \
-	DownloadHelperTest.$(OBJEXT) BencodeTest.$(OBJEXT) \
-	SequentialPickerTest.$(OBJEXT) \
+	DownloadHelperTest.$(OBJEXT) SequentialPickerTest.$(OBJEXT) \
 	RarestPieceSelectorTest.$(OBJEXT) PieceStatManTest.$(OBJEXT) \
 	LongestSequencePieceSelectorTest.$(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 \
 	DirectDiskAdaptorTest.cc CookieTest.cc CookieStorageTest.cc \
 	TimeTest.cc FtpConnectionTest.cc OptionParserTest.cc \
-	SimpleDNSCacheTest.cc DownloadHelperTest.cc BencodeTest.cc \
+	SimpleDNSCacheTest.cc DownloadHelperTest.cc \
 	SequentialPickerTest.cc RarestPieceSelectorTest.cc \
 	PieceStatManTest.cc InOrderPieceSelector.h \
 	LongestSequencePieceSelectorTest.cc a2algoTest.cc \