mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-12 04:42:36 -03:00
Cleanup makefiles such that diffs to them are smaller
Signed-off-by: Giel van Schijndel <me@mortis.eu>
This commit is contained in:
parent
99860de3c9
commit
e49b83bb12
5 changed files with 147 additions and 49 deletions
|
@ -35,9 +35,28 @@ LIBS= \
|
||||||
DEFS=-D_MT -DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH -DUSE_SSL
|
DEFS=-D_MT -DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH -DUSE_SSL
|
||||||
DEBUGFLAGS=-g -D__WXDEBUG__
|
DEBUGFLAGS=-g -D__WXDEBUG__
|
||||||
CFLAGS=-O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
|
CFLAGS=-O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
|
||||||
HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
|
HEADERS = \
|
||||||
script.h db.h net.h irc.h keystore.h main.h wallet.h rpc.h uibase.h ui.h noui.h \
|
base58.h \
|
||||||
crypter.h init.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
|
||||||
|
|
||||||
ifdef USE_UPNP
|
ifdef USE_UPNP
|
||||||
INCLUDEPATHS += -I"$(DEPSDIR)/upnpc-exe-win32-20110215"
|
INCLUDEPATHS += -I"$(DEPSDIR)/upnpc-exe-win32-20110215"
|
||||||
|
@ -49,17 +68,17 @@ endif
|
||||||
LIBS += -l mingwthrd -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l shlwapi
|
LIBS += -l mingwthrd -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l shlwapi
|
||||||
|
|
||||||
OBJS= \
|
OBJS= \
|
||||||
obj/util.o \
|
obj/crypter.o \
|
||||||
obj/script.o \
|
|
||||||
obj/db.o \
|
obj/db.o \
|
||||||
obj/net.o \
|
obj/init.o \
|
||||||
obj/irc.o \
|
obj/irc.o \
|
||||||
obj/keystore.o \
|
obj/keystore.o \
|
||||||
obj/main.o \
|
obj/main.o \
|
||||||
obj/wallet.o \
|
obj/net.o \
|
||||||
obj/rpc.o \
|
obj/rpc.o \
|
||||||
obj/init.o \
|
obj/script.o \
|
||||||
obj/crypter.o \
|
obj/util.o \
|
||||||
|
obj/wallet.o \
|
||||||
cryptopp/obj/sha.o \
|
cryptopp/obj/sha.o \
|
||||||
cryptopp/obj/cpu.o
|
cryptopp/obj/cpu.o
|
||||||
|
|
||||||
|
|
|
@ -32,9 +32,28 @@ LIBS= \
|
||||||
DEFS=-DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH -DUSE_SSL
|
DEFS=-DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH -DUSE_SSL
|
||||||
DEBUGFLAGS=-g -D__WXDEBUG__
|
DEBUGFLAGS=-g -D__WXDEBUG__
|
||||||
CFLAGS=-mthreads -O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
|
CFLAGS=-mthreads -O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
|
||||||
HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
|
HEADERS = \
|
||||||
script.h db.h net.h irc.h keystore.h main.h wallet.h rpc.h uibase.h ui.h noui.h \
|
base58.h \
|
||||||
init.h crypter.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
|
||||||
|
|
||||||
ifdef USE_UPNP
|
ifdef USE_UPNP
|
||||||
INCLUDEPATHS += -I"C:\upnpc-exe-win32-20110215"
|
INCLUDEPATHS += -I"C:\upnpc-exe-win32-20110215"
|
||||||
|
@ -46,17 +65,17 @@ endif
|
||||||
LIBS += -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l shlwapi
|
LIBS += -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l shlwapi
|
||||||
|
|
||||||
OBJS= \
|
OBJS= \
|
||||||
obj/util.o \
|
obj/crypter.o \
|
||||||
obj/script.o \
|
|
||||||
obj/db.o \
|
obj/db.o \
|
||||||
obj/net.o \
|
obj/init.o \
|
||||||
obj/irc.o \
|
obj/irc.o \
|
||||||
obj/keystore.o \
|
obj/keystore.o \
|
||||||
obj/main.o \
|
obj/main.o \
|
||||||
obj/wallet.o \
|
obj/net.o \
|
||||||
obj/rpc.o \
|
obj/rpc.o \
|
||||||
obj/init.o \
|
obj/script.o \
|
||||||
obj/crypter.o \
|
obj/util.o \
|
||||||
|
obj/wallet.o \
|
||||||
cryptopp/obj/sha.o \
|
cryptopp/obj/sha.o \
|
||||||
cryptopp/obj/cpu.o
|
cryptopp/obj/cpu.o
|
||||||
|
|
||||||
|
|
|
@ -32,22 +32,41 @@ DEFS=$(shell $(DEPSDIR)/bin/wx-config --cxxflags) -D__WXMAC_OSX__ -DNOPCH -DMSG_
|
||||||
DEBUGFLAGS=-g -DwxDEBUG_LEVEL=0
|
DEBUGFLAGS=-g -DwxDEBUG_LEVEL=0
|
||||||
# ppc doesn't work because we don't support big-endian
|
# 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)
|
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 \
|
HEADERS = \
|
||||||
script.h db.h net.h irc.h keystore.h main.h wallet.h rpc.h uibase.h ui.h noui.h \
|
base58.h \
|
||||||
init.h crypter.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= \
|
OBJS= \
|
||||||
obj/util.o \
|
obj/crypter.o \
|
||||||
obj/script.o \
|
|
||||||
obj/db.o \
|
obj/db.o \
|
||||||
obj/net.o \
|
obj/init.o \
|
||||||
obj/irc.o \
|
obj/irc.o \
|
||||||
obj/keystore.o \
|
obj/keystore.o \
|
||||||
obj/main.o \
|
obj/main.o \
|
||||||
obj/wallet.o \
|
obj/net.o \
|
||||||
obj/rpc.o \
|
obj/rpc.o \
|
||||||
obj/init.o \
|
obj/script.o \
|
||||||
obj/crypter.o \
|
obj/util.o \
|
||||||
|
obj/wallet.o \
|
||||||
cryptopp/obj/sha.o \
|
cryptopp/obj/sha.o \
|
||||||
cryptopp/obj/cpu.o
|
cryptopp/obj/cpu.o
|
||||||
|
|
||||||
|
|
|
@ -38,22 +38,41 @@ LIBS+= \
|
||||||
|
|
||||||
DEBUGFLAGS=-g -D__WXDEBUG__
|
DEBUGFLAGS=-g -D__WXDEBUG__
|
||||||
CXXFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS)
|
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 \
|
HEADERS = \
|
||||||
script.h db.h net.h irc.h keystore.h main.h wallet.h rpc.h uibase.h ui.h noui.h \
|
base58.h \
|
||||||
init.h crypter.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= \
|
OBJS= \
|
||||||
obj/util.o \
|
obj/crypter.o \
|
||||||
obj/script.o \
|
|
||||||
obj/db.o \
|
obj/db.o \
|
||||||
obj/net.o \
|
obj/init.o \
|
||||||
obj/irc.o \
|
obj/irc.o \
|
||||||
obj/keystore.o \
|
obj/keystore.o \
|
||||||
obj/main.o \
|
obj/main.o \
|
||||||
obj/wallet.o \
|
obj/net.o \
|
||||||
obj/rpc.o \
|
obj/rpc.o \
|
||||||
obj/init.o \
|
obj/script.o \
|
||||||
obj/crypter.o \
|
obj/util.o \
|
||||||
|
obj/wallet.o \
|
||||||
cryptopp/obj/sha.o \
|
cryptopp/obj/sha.o \
|
||||||
cryptopp/obj/cpu.o
|
cryptopp/obj/cpu.o
|
||||||
|
|
||||||
|
|
|
@ -45,21 +45,43 @@ LIBS=$(LIBS) \
|
||||||
|
|
||||||
DEBUGFLAGS=/Os
|
DEBUGFLAGS=/Os
|
||||||
CFLAGS=/MD /c /nologo /EHsc /GR /Zm300 $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
|
CFLAGS=/MD /c /nologo /EHsc /GR /Zm300 $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
|
||||||
HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
|
HEADERS = \
|
||||||
script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h wallet.h keystore.h crypter.h
|
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= \
|
OBJS= \
|
||||||
obj\util.obj \
|
obj\crypter.o \
|
||||||
obj\script.obj \
|
obj\db.o \
|
||||||
obj\db.obj \
|
obj\init.o \
|
||||||
obj\net.obj \
|
obj\irc.o \
|
||||||
obj\irc.obj \
|
obj\keystore.o \
|
||||||
obj\keystore.obj \
|
obj\main.o \
|
||||||
obj\main.obj \
|
obj\net.o \
|
||||||
obj\wallet.obj \
|
obj\rpc.o \
|
||||||
obj\rpc.obj \
|
obj\script.o \
|
||||||
obj\init.obj \
|
obj\util.o \
|
||||||
obj\crypter.obj
|
obj\wallet.o \
|
||||||
|
cryptopp\obj\sha.o \
|
||||||
|
cryptopp\obj\cpu.o
|
||||||
|
|
||||||
CRYPTOPP_OBJS= \
|
CRYPTOPP_OBJS= \
|
||||||
cryptopp\obj\sha.obj \
|
cryptopp\obj\sha.obj \
|
||||||
|
|
Loading…
Reference in a new issue