From e49b83bb1242b37717e5cfabc344b0ff7157484e Mon Sep 17 00:00:00 2001
From: Giel van Schijndel <me@mortis.eu>
Date: Thu, 11 Aug 2011 17:19:36 +0200
Subject: Cleanup makefiles such that diffs to them are smaller

Signed-off-by: Giel van Schijndel <me@mortis.eu>
---
 src/makefile.osx | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

(limited to 'src/makefile.osx')

diff --git a/src/makefile.osx b/src/makefile.osx
index 699911d4e6..7172bcc417 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -32,22 +32,41 @@ DEFS=$(shell $(DEPSDIR)/bin/wx-config --cxxflags) -D__WXMAC_OSX__ -DNOPCH -DMSG_
 DEBUGFLAGS=-g -DwxDEBUG_LEVEL=0
 # ppc doesn't work because we don't support big-endian
 CFLAGS=-mmacosx-version-min=10.5 -arch i386 -arch x86_64 -O3 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
-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 keystore.h main.h wallet.h rpc.h uibase.h ui.h noui.h \
-    init.h crypter.h
+HEADERS = \
+    base58.h \
+    bignum.h \
+    crypter.h \
+    db.h \
+    headers.h \
+    init.h \
+    irc.h \
+    key.h \
+    keystore.h \
+    main.h \
+    net.h \
+    noui.h \
+    rpc.h \
+    script.h \
+    serialize.h \
+    strlcpy.h \
+    ui.h \
+    uibase.h \
+    uint256.h \
+    util.h \
+    wallet.h
 
 OBJS= \
-    obj/util.o \
-    obj/script.o \
+    obj/crypter.o \
     obj/db.o \
-    obj/net.o \
+    obj/init.o \
     obj/irc.o \
     obj/keystore.o \
     obj/main.o \
-    obj/wallet.o \
+    obj/net.o \
     obj/rpc.o \
-    obj/init.o \
-    obj/crypter.o \
+    obj/script.o \
+    obj/util.o \
+    obj/wallet.o \
     cryptopp/obj/sha.o \
     cryptopp/obj/cpu.o
 
-- 
cgit v1.2.3


From 507fd9d15baac950df494742d67bcbafdaa4752c Mon Sep 17 00:00:00 2001
From: Giel van Schijndel <me@mortis.eu>
Date: Thu, 11 Aug 2011 18:14:53 +0200
Subject: Start moving protocol-specific code to protocol.[ch]pp

Move CMessageHeader from net.h to protocol.[ch]pp, with the
implementation in the .cpp compilation unit (compiling once is enough).

This commit does *not* and should not modify *any* code, it only moves
it from net.h and splits it across protocol.cpp and protocol.hpp.

Indentation changes aside the closest thing to a modification of code is
the addition of the 'TODO' comment (the execution of which requires code
modifications and thus doesn't belong in this commit).

Signed-off-by: Giel van Schijndel <me@mortis.eu>
---
 src/makefile.osx | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/makefile.osx')

diff --git a/src/makefile.osx b/src/makefile.osx
index 7172bcc417..48908d9f30 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -45,6 +45,7 @@ HEADERS = \
     main.h \
     net.h \
     noui.h \
+    protocol.h \
     rpc.h \
     script.h \
     serialize.h \
@@ -63,6 +64,7 @@ OBJS= \
     obj/keystore.o \
     obj/main.o \
     obj/net.o \
+    obj/protocol.o \
     obj/rpc.o \
     obj/script.o \
     obj/util.o \
-- 
cgit v1.2.3