X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmakefile.unix;h=4f51ba40e647eb614b8870a18a1a8540c7e33f70;hb=83e34b29071b58d6578b197430d12c55d277a515;hp=cae7d44c7fba8ec7f6fd9d657b4553d014bfc294;hpb=0561bbd1c69263dceb24ffacf850788e6e961a13;p=novacoin.git

diff --git a/src/makefile.unix b/src/makefile.unix
index cae7d44..4f51ba4 100644
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -10,6 +10,8 @@ DEFS=-DBOOST_SPIRIT_THREADSAFE
 DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH))
 LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH))
 
+HOSTTYPE = $(shell arch)
+
 TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
 
 LMODE = dynamic
@@ -99,6 +101,8 @@ OBJS= \
     obj/irc.o \
     obj/keystore.o \
     obj/main.o \
+    obj/scrypt_mine.o \
+    obj/scrypt-${HOSTTYPE}.o \
     obj/net.o \
     obj/protocol.o \
     obj/bitcoinrpc.o \
@@ -107,10 +111,12 @@ OBJS= \
     obj/util.o \
     obj/wallet.o \
     obj/walletdb.o \
-    obj/noui.o
+    obj/noui.o \
+    obj/pbkdf2.o
+
 
 
-all: ppcoind
+all: novacoind
 
 # auto-generated dependencies:
 -include obj/*.P
@@ -128,7 +134,13 @@ obj/%.o: %.cpp
 	      -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
 	  rm -f $(@:%.o=%.d)
 
-ppcoind: $(OBJS:obj/%=obj/%)
+obj/scrypt-x86.o: scrypt-x86.S
+	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+
+obj/scrypt-x86_64.o: scrypt-x86_64.S
+	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+
+novacoind: $(OBJS:obj/%=obj/%)
 	$(CXX) $(xCXXFLAGS) -rdynamic -o $@ $^ $(LDFLAGS) $(LIBS)
 
 TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
@@ -140,25 +152,15 @@ obj-test/%.o: test/%.cpp
 	      -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
 	  rm -f $(@:%.o=%.d)
 
-test_ppcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
+test_novacoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
 	$(CXX) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ -Wl,-B$(LMODE) -lboost_unit_test_framework $(LDFLAGS) $(LIBS)
 
 clean:
-	-rm -f ppcoind test_ppcoin genesis
+	-rm -f novacoind test_novacoin
 	-rm -f obj/*.o
 	-rm -f obj-test/*.o
 	-rm -f obj/*.P
 	-rm -f obj-test/*.P
 	-rm -f src/build.h
-	-rm -f ppcoin/obj/*
-
-ppcoin/obj/genesis.o: ppcoin/genesis.cpp
-	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
-	$(CXX) -c $(xCXXFLAGS) -MMD -DPPCOIN_GENESIS -o obj/nogui/init.o init.cpp
-
-genesis: ppcoin/obj/genesis.o $(OBJS:obj/%=obj/nogui/%)
-	$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
-	-rm -f obj/init.*
-	-rm -f ppcoin/obj/genesis.*
 
 FORCE: