Author: miguel
Date: 2007-03-22 15:02:22 -0500 (Thu, 22 Mar 2007)
New Revision: 74834

Modified:
   trunk/bitsharp/src/Makefile
   trunk/bitsharp/src/MonoTorrent.Client/Makefile
   trunk/bitsharp/src/MonoTorrent.Common/Makefile
   trunk/bitsharp/src/MonoTorrent.Interface/src/Makefile
   trunk/bitsharp/src/MonoTorrent.Tracker/Makefile
Log:
Update Makefiles

Modified: trunk/bitsharp/src/Makefile
===================================================================
--- trunk/bitsharp/src/Makefile 2007-03-22 19:50:13 UTC (rev 74833)
+++ trunk/bitsharp/src/Makefile 2007-03-22 20:02:22 UTC (rev 74834)
@@ -1,22 +1,11 @@
-all: bencoding common client tracker trackerapp testclient
+SUBDIRS = MonoTorrent.BEncoding  MonoTorrent.Common MonoTorrent.Client 
MonoTorrent.Tracker  MonoTorrent.TrackerApp MonoTorrent 
MonoTorrent.Interface/src
 
-bencoding:
-       cd MonoTorrent.BEncoding && $(MAKE)
+all: 
+       for dir in $(SUBDIRS); do \
+               (cd $$dir && make) \
+       done
 
-common:
-       cd MonoTorrent.Common && $(MAKE)
-
-client: 
-       cd MonoTorrent.Client && $(MAKE)
-       
-tracker:
-       cd MonoTorrent.Tracker && $(MAKE)
-
-trackerapp:
-       cd MonoTorrent.TrackerApp && $(MAKE)
-
-testclient:
-       cd MonoTorrent && $(MAKE)
-
-interface:
-       cd MonoTorrent.Interface/src && $(MAKE)
+clean:
+       for dir in $(SUBDIRS); do \
+               (cd $$dir && make clean)
+       done
\ No newline at end of file

Modified: trunk/bitsharp/src/MonoTorrent.Client/Makefile
===================================================================
--- trunk/bitsharp/src/MonoTorrent.Client/Makefile      2007-03-22 19:50:13 UTC 
(rev 74833)
+++ trunk/bitsharp/src/MonoTorrent.Client/Makefile      2007-03-22 20:02:22 UTC 
(rev 74834)
@@ -1,80 +1,83 @@
 CSC=gmcs 
+
 OUT=../bin/MonoTorrent.Client.dll
-REFERENCES=../bin/MonoTorrent.Common.dll,System.Web,Mono.Security.dll,../bin/Monotorrent.BEncoding.dll,../Libs/Upnp.dll
+
+REFERENCES=../bin/MonoTorrent.Common.dll,System.Web,Mono.Security.dll,../bin/MonoTorrent.BEncoding.dll,../Libs/Upnp.dll
+
 SOURCES=BitField.cs \
-Block.cs \
-BufferedFileRead.cs \
-BufferedFileWrite.cs \
-ClientEngine.cs \
-ConnectionListener.cs \
-Logger.cs \
-PeerList.cs \
-PortMapper.cs \
-RateLimiter.cs \
-TransferType.cs \
-Encryption/EncryptedSocket.cs \
-Encryption/IEncryption.cs \
-Encryption/IEncryptor.cs \
-Encryption/ModuloCalculator.cs \
-Encryption/NoEncryption.cs \
-Encryption/NullEncryption.cs \
-Encryption/PeerAEncryption.cs \
-Encryption/PeerBEncryption.cs \
-Encryption/RC4.cs \
-EventArgs/MessageEventArgs.cs \
-EventArgs/PeerConnectionEventArgs.cs \
-EventArgs/PeersAddedEventArgs.cs \
-EventArgs/PieceEventArgs.cs \
-EventArgs/PieceHashedEventArgs.cs \
-EventArgs/TorrentStateChangedEventArgs.cs \
-EventArgs/TrackerStateChangedEventArgs.cs \
-Exceptions/ConnectionException.cs \
-Exceptions/MessageException.cs \
-Exceptions/ListenerException.cs \
-Exceptions/ProtocolException.cs \
-Exceptions/TorrentLoadException.cs \
-Peers/Peer.cs \
-PeerConnections/PeerConnectionId.cs \
-PeerConnections/PeerConnectionBase.cs \
-PeerConnections/TCPConnection.cs \
-PiecePicking/EndGamePicker.cs \
-PiecePicking/PiecePickerBase.cs \
-PiecePicking/StandardPicker.cs \
-Managers/BufferManager.cs \
-Managers/ConnectionManager.cs \
-Managers/ConnectionMonitor.cs \
-Managers/FileManager.cs \
-Managers/PieceManager.cs \
-Managers/TorrentManager.cs \
-Managers/TrackerManager.cs \
-PeerMessages/BitfieldMessage.cs \
-PeerMessages/CancelMessage.cs \
-PeerMessages/ChokeMessage.cs \
-PeerMessages/HandshakeMessage.cs \
-PeerMessages/HaveMessage.cs \
-PeerMessages/InterestedMessage.cs \
-PeerMessages/IPeerMessage.cs \
-PeerMessages/IPeerMessageInternal.cs \
-PeerMessages/KeepAliveMessage.cs \
-PeerMessages/NotInterestedMessage.cs \
-PeerMessages/PeerwireEncoder.cs \
-PeerMessages/PieceMessage.cs \
-PeerMessages/PortMessage.cs \
-PeerMessages/RequestMessage.cs \
-PeerMessages/UnchokeMessage.cs \
-PeerMessages/UnknownMessage.cs \
-PeerMessages/ExtendedMessages/ExtendedListMessage.cs \
-PeerMessages/FastPeerExtensions/AllowedFastMessage.cs \
-PeerMessages/FastPeerExtensions/HaveAllMessage.cs \
-PeerMessages/FastPeerExtensions/HaveNoneMessage.cs \
-PeerMessages/FastPeerExtensions/RejectRequestMessage.cs \
-PeerMessages/FastPeerExtensions/SuggestPieceMessage.cs \
-Settings/EngineSettings.cs \
-Settings/TorrentSettings.cs \
-Piece.cs \
-TrackerConnectionId.cs \
-AllowedFastAlgorithm.cs \
-Tracker.cs
+       Block.cs \
+       BufferedFileRead.cs \
+       BufferedFileWrite.cs \
+       ClientEngine.cs \
+       ConnectionListener.cs \
+       Logger.cs \
+       PeerList.cs \
+       PortMapper.cs \
+       RateLimiter.cs \
+       TransferType.cs \
+       Encryption/EncryptedSocket.cs \
+       Encryption/IEncryption.cs \
+       Encryption/IEncryptor.cs \
+       Encryption/ModuloCalculator.cs \
+       Encryption/NoEncryption.cs \
+       Encryption/NullEncryption.cs \
+       Encryption/PeerAEncryption.cs \
+       Encryption/PeerBEncryption.cs \
+       Encryption/RC4.cs \
+       EventArgs/MessageEventArgs.cs \
+       EventArgs/PeerConnectionEventArgs.cs \
+       EventArgs/PeersAddedEventArgs.cs \
+       EventArgs/PieceEventArgs.cs \
+       EventArgs/PieceHashedEventArgs.cs \
+       EventArgs/TorrentStateChangedEventArgs.cs \
+       EventArgs/TrackerStateChangedEventArgs.cs \
+       Exceptions/ConnectionException.cs \
+       Exceptions/MessageException.cs \
+       Exceptions/ListenerException.cs \
+       Exceptions/ProtocolException.cs \
+       Exceptions/TorrentLoadException.cs \
+       Peers/Peer.cs \
+       PeerConnections/PeerConnectionId.cs \
+       PeerConnections/PeerConnectionBase.cs \
+       PeerConnections/TCPConnection.cs \
+       PiecePicking/EndGamePicker.cs \
+       PiecePicking/PiecePickerBase.cs \
+       PiecePicking/StandardPicker.cs \
+       Managers/BufferManager.cs \
+       Managers/ConnectionManager.cs \
+       Managers/ConnectionMonitor.cs \
+       Managers/FileManager.cs \
+       Managers/PieceManager.cs \
+       Managers/TorrentManager.cs \
+       Managers/TrackerManager.cs \
+       PeerMessages/BitfieldMessage.cs \
+       PeerMessages/CancelMessage.cs \
+       PeerMessages/ChokeMessage.cs \
+       PeerMessages/HandshakeMessage.cs \
+       PeerMessages/HaveMessage.cs \
+       PeerMessages/InterestedMessage.cs \
+       PeerMessages/IPeerMessage.cs \
+       PeerMessages/IPeerMessageInternal.cs \
+       PeerMessages/KeepAliveMessage.cs \
+       PeerMessages/NotInterestedMessage.cs \
+       PeerMessages/PeerwireEncoder.cs \
+       PeerMessages/PieceMessage.cs \
+       PeerMessages/PortMessage.cs \
+       PeerMessages/RequestMessage.cs \
+       PeerMessages/UnchokeMessage.cs \
+       PeerMessages/UnknownMessage.cs \
+       PeerMessages/ExtendedMessages/ExtendedListMessage.cs \
+       PeerMessages/FastPeerExtensions/AllowedFastMessage.cs \
+       PeerMessages/FastPeerExtensions/HaveAllMessage.cs \
+       PeerMessages/FastPeerExtensions/HaveNoneMessage.cs \
+       PeerMessages/FastPeerExtensions/RejectRequestMessage.cs \
+       PeerMessages/FastPeerExtensions/SuggestPieceMessage.cs \
+       Settings/EngineSettings.cs \
+       Settings/TorrentSettings.cs \
+       Piece.cs \
+       TrackerConnectionId.cs \
+       AllowedFastAlgorithm.cs \
+       Tracker.cs
 
 #Tests/BitFieldTest.cs \
 #Tests/FileManager.cs \
@@ -82,8 +85,11 @@
 #Tests/AllowedFastAlgorithmTest.cs \
 
 
-all: client
+all: $(OUT)
 
-client: $(SOURCES)
+$(OUT): $(SOURCES)
        mkdir -p ../bin
        $(CSC) -r:$(REFERENCES) -target:library -d:DEBUG -out:$(OUT) $(SOURCES)
+
+clean:
+       -rm $(OUT)
\ No newline at end of file

Modified: trunk/bitsharp/src/MonoTorrent.Common/Makefile
===================================================================
--- trunk/bitsharp/src/MonoTorrent.Common/Makefile      2007-03-22 19:50:13 UTC 
(rev 74833)
+++ trunk/bitsharp/src/MonoTorrent.Common/Makefile      2007-03-22 20:02:22 UTC 
(rev 74834)
@@ -23,9 +23,9 @@
 
 
 
-all: common
+all: $(OUT)
 
-common: $(SOURCES)
+$(OUT): $(SOURCES)
        mkdir -p ../bin
        $(CSC) $(SOURCES) -target:library -d:DEBUG -out:$(OUT) -r:$(REFERENCES)
-       
+

Modified: trunk/bitsharp/src/MonoTorrent.Interface/src/Makefile
===================================================================
--- trunk/bitsharp/src/MonoTorrent.Interface/src/Makefile       2007-03-22 
19:50:13 UTC (rev 74833)
+++ trunk/bitsharp/src/MonoTorrent.Interface/src/Makefile       2007-03-22 
20:02:22 UTC (rev 74834)
@@ -27,17 +27,21 @@
        MonoTorrent.Interface/Settings/GConfSettingsStorage.cs \
        MonoTorrent.Interface/Settings/Configuration.cs \
        AssemblyInfo.cs
-REFERENCES=../../Client.dll \
-       ../../Common.dll \
-       
+
+REFERENCES=../../bin/MonoTorrent.Client.dll \
+       ../../bin/MonoTorrent.Common.dll
+
 RESOURCES=../res/ui.xml \
        ../COPYING
 
 REFERENCES_B=$(addprefix -reference:, $(REFERENCES))
 RESOURCE_B=$(addprefix -resource:, $(RESOURCES))
 
-all: interface
+all: $(OUT)
 
-interface: $(SOURCES)
+$(OUT): $(SOURCES)
        mkdir -p ../bin
-       $(CSC) $(SOURCES) $(RESOURCE_B) $(REFERENCES_B) -pkg:gtk-sharp 
-target:winexe -d:DEBUG -out:$(OUT)
\ No newline at end of file
+       $(CSC) $(SOURCES) $(RESOURCE_B) -r:Mono.Posix $(REFERENCES_B) 
-pkg:gtk-sharp-2.0 -pkg:gconf-sharp-2.0 -target:winexe -d:DEBUG -out:$(OUT)
+
+clean: 
+       rm $(OUT)

Modified: trunk/bitsharp/src/MonoTorrent.Tracker/Makefile
===================================================================
--- trunk/bitsharp/src/MonoTorrent.Tracker/Makefile     2007-03-22 19:50:13 UTC 
(rev 74833)
+++ trunk/bitsharp/src/MonoTorrent.Tracker/Makefile     2007-03-22 20:02:22 UTC 
(rev 74834)
@@ -20,9 +20,8 @@
        Tracker.cs \
        TrackerEngine.cs 
 
+all: $(OUT)
 
-all: tracker
-
-tracker: $(SOURCES)
+$(OUT): $(SOURCES)
        mkdir -p ../bin
        $(CSC) $(SOURCES) -target:library -out:$(OUT) -r:$(REFERENCES)

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to