From 0bbbee96b742e4ad0fd5e1d3c33e4bd2247e4445 Mon Sep 17 00:00:00 2001
From: s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>
Date: Fri, 11 Dec 2009 16:49:21 +0000
Subject: retry IRC if name in use, resize to fit ubuntu's giant default font,
 scroll debug.log, pause gen during initial block download

---
 makefile | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'makefile')

diff --git a/makefile b/makefile
index 2d932f02c..0dd622106 100644
--- a/makefile
+++ b/makefile
@@ -10,8 +10,6 @@ endif
 endif
 ifeq "$(BUILD)" "debug"
 D=d
-# note: gcc 3.x profile doesn't work
-#DEBUGFLAGS=-O0 -g -pg -D__WXDEBUG__
 DEBUGFLAGS=-g -D__WXDEBUG__
 endif
 
@@ -36,34 +34,34 @@ all: bitcoin.exe
 headers.h.gch: headers.h $(HEADERS) net.h irc.h market.h uibase.h ui.h
 	g++ -c $(CFLAGS) -o $@ $<
 
-obj/util.o: util.cpp		    $(HEADERS)
+obj/util.o: util.cpp                $(HEADERS)
 	g++ -c $(CFLAGS) -o $@ $<
 
-obj/script.o: script.cpp	    $(HEADERS)
+obj/script.o: script.cpp            $(HEADERS)
 	g++ -c $(CFLAGS) -o $@ $<
 
-obj/db.o: db.cpp		    $(HEADERS) market.h
+obj/db.o: db.cpp                    $(HEADERS) market.h
 	g++ -c $(CFLAGS) -o $@ $<
 
-obj/net.o: net.cpp		    $(HEADERS) net.h
+obj/net.o: net.cpp                  $(HEADERS) net.h
 	g++ -c $(CFLAGS) -o $@ $<
 
-obj/main.o: main.cpp		    $(HEADERS) net.h market.h sha.h
+obj/main.o: main.cpp                $(HEADERS) net.h market.h sha.h
 	g++ -c $(CFLAGS) -o $@ $<
 
-obj/market.o: market.cpp	    $(HEADERS) market.h
+obj/market.o: market.cpp            $(HEADERS) market.h
 	g++ -c $(CFLAGS) -o $@ $<
 
-obj/ui.o: ui.cpp		    $(HEADERS) net.h uibase.h ui.h market.h
+obj/ui.o: ui.cpp                    $(HEADERS) net.h uibase.h ui.h market.h
 	g++ -c $(CFLAGS) -o $@ $<
 
-obj/uibase.o: uibase.cpp	    uibase.h
+obj/uibase.o: uibase.cpp            uibase.h
 	g++ -c $(CFLAGS) -o $@ $<
 
-obj/sha.o: sha.cpp		    sha.h
+obj/sha.o: sha.cpp                  sha.h
 	g++ -c $(CFLAGS) -O3 -o $@ $<
 
-obj/irc.o:  irc.cpp		    $(HEADERS)
+obj/irc.o: irc.cpp                  $(HEADERS)
 	g++ -c $(CFLAGS) -o $@ $<
 
 obj/ui_res.o: ui.rc  rc/bitcoin.ico rc/check.ico rc/send16.bmp rc/send16mask.bmp rc/send16masknoshadow.bmp rc/send20.bmp rc/send20mask.bmp rc/addressbook16.bmp rc/addressbook16mask.bmp rc/addressbook20.bmp rc/addressbook20mask.bmp
@@ -71,8 +69,8 @@ obj/ui_res.o: ui.rc  rc/bitcoin.ico rc/check.ico rc/send16.bmp rc/send16mask.bmp
 
 
 
-OBJS=obj/util.o obj/script.o obj/db.o obj/net.o obj/main.o obj/market.o	 \
-	obj/ui.o obj/uibase.o obj/sha.o obj/irc.o obj/ui_res.o
+OBJS=obj/util.o obj/script.o obj/db.o obj/net.o obj/main.o obj/market.o \
+        obj/ui.o obj/uibase.o obj/sha.o obj/irc.o obj/ui_res.o
 
 bitcoin.exe: headers.h.gch $(OBJS)
 	-kill /f bitcoin.exe
-- 
cgit v1.2.3