Fix makefile

This commit is contained in:
myriadcoin
2014-02-23 20:44:58 +02:00
parent 7d3c795a38
commit f4405c8a3c
4 changed files with 101 additions and 30 deletions
+22 -6
View File
@@ -94,9 +94,22 @@ OBJS= \
obj/bloom.o \
obj/leveldb.o \
obj/txdb.o \
obj/chainparams.o
obj/chainparams.o \
obj/scrypt.o \
obj/scrypt-sse2.o \
obj/blake.o \
obj/bmw.o \
obj/groestl.o \
obj/jh.o \
obj/keccak.o \
obj/skein.o \
obj/echo.o \
obj/luffa.o \
obj/simd.o \
obj/cubehash.o \
obj/shavite.o
all: zetacoind.exe
all: myriadcoind.exe
DEFS += -I"$(CURDIR)/leveldb/include"
DEFS += -I"$(CURDIR)/leveldb/helpers"
@@ -111,7 +124,10 @@ DEFS += -DHAVE_BUILD_INFO
obj/%.o: %.cpp $(HEADERS)
$(CXX) -c $(xCXXFLAGS) -o $@ $<
zetacoind.exe: $(OBJS:obj/%=obj/%)
obj/%.o: %.c $(HEADERS)
$(CXX) -c $(xCXXFLAGS) -fpermissive -o $@ $<
myriadcoind.exe: $(OBJS:obj/%=obj/%)
$(CXX) $(xCXXFLAGS) $(xLDFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
@@ -119,15 +135,15 @@ TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
obj-test/%.o: test/%.cpp $(HEADERS)
$(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -o $@ $<
test_zetacoin.exe: $(TESTOBJS) $(filter-out obj/init.o obj/zetacoind.o,$(OBJS:obj/%=obj/%))
test_myriadcoin.exe: $(TESTOBJS) $(filter-out obj/init.o obj/myriadcoind.o,$(OBJS:obj/%=obj/%))
$(CXX) $(xCXXFLAGS) $(xLDFLAGS) -o $@ $(LIBPATHS) $^ -lboost_unit_test_framework-mt-s $(LIBS)
clean:
-rm -f obj/*.o
-rm -f zetacoind.exe
-rm -f myriadcoind.exe
-rm -f obj-test/*.o
-rm -f test_zetacoin.exe
-rm -f test_myriadcoin.exe
-rm -f obj/build.h
cd leveldb && TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) clean && cd ..
+23 -7
View File
@@ -102,13 +102,26 @@ OBJS= \
obj/noui.o \
obj/leveldb.o \
obj/txdb.o \
obj/chainparams.o
obj/chainparams.o \
obj/scrypt.o \
obj/scrypt-sse2.o \
obj/blake.o \
obj/bmw.o \
obj/groestl.o \
obj/jh.o \
obj/keccak.o \
obj/skein.o \
obj/echo.o \
obj/luffa.o \
obj/simd.o \
obj/cubehash.o \
obj/shavite.o
all: zetacoind.exe
all: myriadcoind.exe
test check: test_zetacoin.exe FORCE
test_zetacoin.exe
test check: test_myriadcoin.exe FORCE
test_myriadcoin.exe
#
# LevelDB support
@@ -122,7 +135,10 @@ leveldb/libleveldb.a:
obj/%.o: %.cpp $(HEADERS)
$(CXX) -c $(CFLAGS) -o $@ $<
zetacoind.exe: $(OBJS:obj/%=obj/%)
obj/%.o: %.c $(HEADERS)
$(CXX) -c $(CFLAGS) -fpermissive -o $@ $<
myriadcoind.exe: $(OBJS:obj/%=obj/%)
$(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
@@ -130,11 +146,11 @@ TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
obj-test/%.o: test/%.cpp $(HEADERS)
$(CXX) -c $(TESTDEFS) $(CFLAGS) -o $@ $<
test_zetacoin.exe: $(TESTOBJS) $(filter-out obj/init.o obj/zetacoind.o,$(OBJS:obj/%=obj/%))
test_myriadcoin.exe: $(TESTOBJS) $(filter-out obj/init.o obj/myriadcoind.o,$(OBJS:obj/%=obj/%))
$(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBPATHS) $^ -lboost_unit_test_framework$(BOOST_SUFFIX) $(LIBS)
clean:
rm -f zetacoind.exe test_zetacoin.exe
rm -f myriadcoind.exe test_myriadcoin.exe
rm -f obj/*
rm -f obj-test/*
cd leveldb && $(MAKE) TARGET_OS=NATIVE_WINDOWS clean && cd ..
+29 -9
View File
@@ -3,7 +3,7 @@
# Distributed under the MIT/X11 software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
# Mac OS X makefile for zetacoin
# Mac OS X makefile for myriadcoin
# Originally by Laszlo Hanyecz (solar@heliacal.net)
CXX=llvm-g++
@@ -27,7 +27,7 @@ LIBS= -dead_strip
TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
ifdef STATIC
# Build STATIC if you are redistributing the zetacoind binary
# Build STATIC if you are redistributing the myriadcoind binary
TESTLIBS += \
$(DEPSDIR)/lib/libboost_unit_test_framework-mt.a
LIBS += \
@@ -105,7 +105,20 @@ OBJS= \
obj/noui.o \
obj/leveldb.o \
obj/txdb.o \
obj/chainparams.o
obj/chainparams.o \
obj/scrypt.o \
obj/scrypt-sse2.o \
obj/blake.o \
obj/bmw.o \
obj/groestl.o \
obj/jh.o \
obj/keccak.o \
obj/skein.o \
obj/echo.o \
obj/luffa.o \
obj/simd.o \
obj/cubehash.o \
obj/shavite.o
ifndef USE_UPNP
override USE_UPNP = -
@@ -123,10 +136,10 @@ ifneq (${USE_IPV6}, -)
DEFS += -DUSE_IPV6=$(USE_IPV6)
endif
all: zetacoind
all: myriadcoind
test check: test_zetacoin FORCE
./test_zetacoin
test check: test_myriadcoin FORCE
./test_myriadcoin
#
# LevelDB support
@@ -153,7 +166,14 @@ obj/%.o: %.cpp
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d)
zetacoind: $(OBJS:obj/%=obj/%)
obj/%.o: %.c
$(CXX) -c $(CFLAGS) -fpermissive -MMD -MF $(@:%.o=%.d) -o $@ $<
@cp $(@:%.o=%.d) $(@:%.o=%.P); \
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d)
myriadcoind: $(OBJS:obj/%=obj/%)
$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
@@ -165,11 +185,11 @@ obj-test/%.o: test/%.cpp
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d)
test_zetacoin: $(TESTOBJS) $(filter-out obj/init.o obj/zetacoind.o,$(OBJS:obj/%=obj/%))
test_myriadcoin: $(TESTOBJS) $(filter-out obj/init.o obj/myriadcoind.o,$(OBJS:obj/%=obj/%))
$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) $(TESTLIBS)
clean:
-rm -f zetacoind test_zetacoin
-rm -f myriadcoind test_myriadcoin
-rm -f obj/*.o
-rm -f obj-test/*.o
-rm -f obj/*.P
+27 -8
View File
@@ -144,13 +144,25 @@ OBJS= \
obj/noui.o \
obj/leveldb.o \
obj/txdb.o \
obj/chainparams.o
obj/chainparams.o \
obj/scrypt.o \
obj/scrypt-sse2.o \
obj/blake.o \
obj/bmw.o \
obj/groestl.o \
obj/jh.o \
obj/keccak.o \
obj/skein.o \
obj/echo.o \
obj/luffa.o \
obj/simd.o \
obj/cubehash.o \
obj/shavite.o
all: myriadcoind
all: zetacoind
test check: test_zetacoin FORCE
./test_zetacoin
test check: test_myriadcoin FORCE
./test_myriadcoin
#
# LevelDB support
@@ -178,7 +190,14 @@ obj/%.o: %.cpp
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d)
zetacoind: $(OBJS:obj/%=obj/%)
obj/%.o: %.c
$(CXX) -c $(xCXXFLAGS) -fpermissive -MMD -MF $(@:%.o=%.d) -o $@ $<
@cp $(@:%.o=%.d) $(@:%.o=%.P); \
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d)
myriadcoind: $(OBJS:obj/%=obj/%)
$(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS)
TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
@@ -190,11 +209,11 @@ obj-test/%.o: test/%.cpp
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d)
test_zetacoin: $(TESTOBJS) $(filter-out obj/init.o obj/zetacoind.o,$(OBJS:obj/%=obj/%))
test_myriadcoin: $(TESTOBJS) $(filter-out obj/init.o obj/myriadcoind.o,$(OBJS:obj/%=obj/%))
$(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ $(TESTLIBS) $(xLDFLAGS) $(LIBS)
clean:
-rm -f zetacoind test_zetacoin
-rm -f myriadcoind test_myriadcoin
-rm -f obj/*.o
-rm -f obj-test/*.o
-rm -f obj/*.P