From 84c3fb07b0b8199c7f85c5de280e7100bad0786f Mon Sep 17 00:00:00 2001
From: Jaromil <jaromil@dyne.org>
Date: Sat, 23 Apr 2011 11:49:47 +0200
Subject: directory re-organization (keeps the old build system)

there is no internal modification of any file in this commit

files are moved into directories according to established standards in
sourcecode distribution; these directories contain:

 src - Files that are used in constructing the executable binaries,
       but are not installed.

 doc - Files in HTML and text format that document usage, quirks of
       the implementation, and contributor checklists.

 locale - Files that contain human language translation of strings
          used in the program

 contrib - Files contributed from distributions or other third party
 	   implementing scripts and auxiliary programs
---
 src/makefile.unix | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 src/makefile.unix

(limited to 'src/makefile.unix')

diff --git a/src/makefile.unix b/src/makefile.unix
new file mode 100644
index 000000000..61b925e3b
--- /dev/null
+++ b/src/makefile.unix
@@ -0,0 +1,85 @@
+# Copyright (c) 2009-2010 Satoshi Nakamoto
+# Distributed under the MIT/X11 software license, see the accompanying
+# file license.txt or http://www.opensource.org/licenses/mit-license.php.
+
+CXX=g++
+
+WXINCLUDEPATHS=$(shell wx-config --cxxflags)
+
+WXLIBS=$(shell wx-config --libs)
+
+USE_UPNP:=0
+
+DEFS=-DNOPCH -DFOURWAYSSE2 -DUSE_SSL
+
+# for boost 1.37, add -mt to the boost libraries
+LIBS= \
+ -Wl,-Bstatic \
+   -l boost_system \
+   -l boost_filesystem \
+   -l boost_program_options \
+   -l boost_thread \
+   -l db_cxx \
+   -l ssl \
+   -l crypto
+
+ifdef USE_UPNP
+	LIBS += -l miniupnpc
+	DEFS += -DUSE_UPNP=$(USE_UPNP)
+endif
+
+LIBS+= \
+ -Wl,-Bdynamic \
+   -l gthread-2.0 \
+   -l z \
+   -l dl
+
+
+DEBUGFLAGS=-g -D__WXDEBUG__
+CXXFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS)
+HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
+    script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h
+
+OBJS= \
+    obj/util.o \
+    obj/script.o \
+    obj/db.o \
+    obj/net.o \
+    obj/irc.o \
+    obj/main.o \
+    obj/rpc.o \
+    obj/init.o \
+    cryptopp/obj/sha.o \
+    cryptopp/obj/cpu.o
+
+
+all: bitcoin
+
+
+obj/%.o: %.cpp $(HEADERS)
+	$(CXX) -c $(CXXFLAGS) $(WXINCLUDEPATHS) -DGUI -o $@ $<
+
+cryptopp/obj/%.o: cryptopp/%.cpp
+	$(CXX) -c $(CXXFLAGS) -O3 -o $@ $<
+
+obj/sha256.o: sha256.cpp
+	$(CXX) -c $(CXXFLAGS) -msse2 -O3 -march=amdfam10 -o $@ $<
+
+bitcoin: $(OBJS) obj/ui.o obj/uibase.o obj/sha256.o
+	$(CXX) $(CXXFLAGS) -o $@ $^ $(WXLIBS) $(LIBS)
+
+
+obj/nogui/%.o: %.cpp $(HEADERS)
+	$(CXX) -c $(CXXFLAGS) -o $@ $<
+
+bitcoind: $(OBJS:obj/%=obj/nogui/%) obj/sha256.o
+	$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
+
+
+clean:
+	-rm -f obj/*.o
+	-rm -f obj/nogui/*.o
+	-rm -f cryptopp/obj/*.o
+	-rm -f headers.h.gch
+	-rm -f bitcoin
+	-rm -f bitcoind
-- 
cgit v1.2.3


From e89b9f6a2abaa120ff0fc3cea9ae364e8cbd25e4 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 1 Jun 2011 18:27:05 +0200
Subject: move wallet code to separate file

This introduces two new source files, keystore.cpp and wallet.cpp with
corresponding headers. Code is moved from main and db, in a preparation
for a follow-up commit which introduces the classes CWallet and CKeyStore.
---
 src/makefile.unix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/makefile.unix')

diff --git a/src/makefile.unix b/src/makefile.unix
index 4f2da3789..f2d85b9dd 100644
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -39,7 +39,7 @@ LIBS+= \
 DEBUGFLAGS=-g -D__WXDEBUG__
 CXXFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS)
 HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
-    script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h
+    script.h db.h net.h irc.h keystore.h main.h wallet.h rpc.h uibase.h ui.h noui.h init.h
 
 OBJS= \
     obj/util.o \
@@ -47,7 +47,9 @@ OBJS= \
     obj/db.o \
     obj/net.o \
     obj/irc.o \
+    obj/keystore.o \
     obj/main.o \
+    obj/wallet.o \
     obj/rpc.o \
     obj/init.o \
     cryptopp/obj/sha.o \
-- 
cgit v1.2.3


From 8baf865c94653e21d4f6f43bbb5c712b16aba0e4 Mon Sep 17 00:00:00 2001
From: Gavin Andresen <gavinandresen@gmail.com>
Date: Mon, 27 Jun 2011 14:05:02 -0400
Subject: Boost unit-testing framework. make -f makefile.{unix,osx,mingw}
 test_bitcoin to compile dumb, do-almost-nothing placeholder unit tests.

---
 src/makefile.unix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/makefile.unix')

diff --git a/src/makefile.unix b/src/makefile.unix
index f2d85b9dd..bb26bf5ed 100644
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -75,11 +75,16 @@ obj/nogui/%.o: %.cpp $(HEADERS)
 bitcoind: $(OBJS:obj/%=obj/nogui/%)
 	$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
 
+obj/test/%.o: test/%.cpp $(HEADERS)
+	$(CXX) -c $(CFLAGS) -o $@ $<
+
+test_bitcoin: obj/test/test_bitcoin.o
+	$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) -lboost_unit_test_framework
 
 clean:
+	-rm -f bitcoin bitcoind test_bitcoin
 	-rm -f obj/*.o
 	-rm -f obj/nogui/*.o
+	-rm -f obj/test/*.o
 	-rm -f cryptopp/obj/*.o
 	-rm -f headers.h.gch
-	-rm -f bitcoin
-	-rm -f bitcoind
-- 
cgit v1.2.3


From ee1f884229736da6f5443157ccba97f4e8f50f82 Mon Sep 17 00:00:00 2001
From: Matt Corallo <matt@bluematt.me>
Date: Sat, 2 Jul 2011 01:03:07 +0200
Subject: Make UPnP default on Bitcoin but not on Bitcoind.

This is a bit of an ugly hack, but its the only way to do it.
---
 src/makefile.unix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'src/makefile.unix')

diff --git a/src/makefile.unix b/src/makefile.unix
index bb26bf5ed..82d2a9f5c 100644
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -8,8 +8,6 @@ WXINCLUDEPATHS=$(shell wx-config --cxxflags)
 
 WXLIBS=$(shell wx-config --libs)
 
-USE_UPNP:=0
-
 DEFS=-DNOPCH -DFOURWAYSSE2 -DUSE_SSL
 
 # for boost 1.37, add -mt to the boost libraries
@@ -23,10 +21,17 @@ LIBS= \
    -l ssl \
    -l crypto
 
-ifdef USE_UPNP
-	LIBS += -l miniupnpc
-	DEFS += -DUSE_UPNP=$(USE_UPNP)
-endif
+bitcoin: USE_UPNP:=1
+	ifdef USE_UPNP
+		LIBS += -l miniupnpc
+		DEFS += -DUSE_UPNP=$(USE_UPNP)
+	endif
+
+bitcoind: USE_UPNP:=0
+	ifdef USE_UPNP
+		LIBS += -l miniupnpc
+		DEFS += -DUSE_UPNP=$(USE_UPNP)
+	endif
 
 LIBS+= \
  -Wl,-Bdynamic \
-- 
cgit v1.2.3


From 3f0950ea019ad43c2a8fc79c2aa61845003bd4dc Mon Sep 17 00:00:00 2001
From: Matt Corallo <matt@bluematt.me>
Date: Tue, 5 Jul 2011 18:19:34 +0200
Subject: Revert "Make UPnP default on Bitcoin but not on Bitcoind."

This reverts commit ee1f884229736da6f5443157ccba97f4e8f50f82.

Stupid, stupid me...there is exactly 0 way to convince make to
execute a conditional based on a target-specific variable.
---
 src/makefile.unix | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'src/makefile.unix')

diff --git a/src/makefile.unix b/src/makefile.unix
index 82d2a9f5c..bb26bf5ed 100644
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -8,6 +8,8 @@ WXINCLUDEPATHS=$(shell wx-config --cxxflags)
 
 WXLIBS=$(shell wx-config --libs)
 
+USE_UPNP:=0
+
 DEFS=-DNOPCH -DFOURWAYSSE2 -DUSE_SSL
 
 # for boost 1.37, add -mt to the boost libraries
@@ -21,17 +23,10 @@ LIBS= \
    -l ssl \
    -l crypto
 
-bitcoin: USE_UPNP:=1
-	ifdef USE_UPNP
-		LIBS += -l miniupnpc
-		DEFS += -DUSE_UPNP=$(USE_UPNP)
-	endif
-
-bitcoind: USE_UPNP:=0
-	ifdef USE_UPNP
-		LIBS += -l miniupnpc
-		DEFS += -DUSE_UPNP=$(USE_UPNP)
-	endif
+ifdef USE_UPNP
+	LIBS += -l miniupnpc
+	DEFS += -DUSE_UPNP=$(USE_UPNP)
+endif
 
 LIBS+= \
  -Wl,-Bdynamic \
-- 
cgit v1.2.3