From: CryptoManiac <balthazar.ad@gmail.com>
Date: Tue, 13 Oct 2015 12:11:34 +0000 (-0700)
Subject: makefile fixes
X-Git-Tag: nvc-v0.5.5~32
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=1663f4a94dbb36331d2930c89eb51c0213200236

makefile fixes

copy&paste == evil
---

diff --git a/src/makefile.bsd b/src/makefile.bsd
index bcd030a..09dc14b 100644
--- a/src/makefile.bsd
+++ b/src/makefile.bsd
@@ -237,6 +237,9 @@ clean:
 	-rm -f crypto/scrypt/generic/obj/*.o
 	-rm -f crypto/scrypt/generic/obj/*.P
 	-rm -f crypto/scrypt/generic/obj/*.d
+        -rm -f crypto/sha2/asm/obj/*.o
+        -rm -f crypto/sha2/asm/obj/*.P
+        -rm -f crypto/sha2/asm/obj/*.d
 	-rm -f obj/build.h
 
 FORCE:
diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw
index b5f9809..63aba19 100644
--- a/src/makefile.linux-mingw
+++ b/src/makefile.linux-mingw
@@ -209,6 +209,9 @@ clean:
 	-rm -f crypto/scrypt/generic/obj/*.o
 	-rm -f crypto/scrypt/generic/obj/*.P
 	-rm -f crypto/scrypt/generic/obj/*.d
+        -rm -f crypto/sha2/asm/obj/*.o
+        -rm -f crypto/sha2/asm/obj/*.P
+        -rm -f crypto/sha2/asm/obj/*.d
 	-rm -f obj/build.h
 	cd leveldb && TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) clean && cd ..
 
diff --git a/src/makefile.mingw b/src/makefile.mingw
index ef1ecfe..c2298c7 100644
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
@@ -131,7 +131,7 @@ OBJS += crypto/sha2/asm/obj/sha2-arm.o crypto/sha2/asm/obj/sha2-x86.o crypto/sha
 crypto/scrypt/asm/obj/scrypt-x86.o: crypto/scrypt/asm/scrypt-x86.S
 	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
-scrypt-asm/obj/scrypt-x86_64.o: crypto/scrypt/asm/scrypt-x86_64.S
+crypto/scrypt/asm/obj/scrypt-x86_64.o: crypto/scrypt/asm/scrypt-x86_64.S
 	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
 crypto/scrypt/asm/obj/scrypt-arm.o: crypto/scrypt/asm/scrypt-arm.S
@@ -140,13 +140,13 @@ crypto/scrypt/asm/obj/scrypt-arm.o: crypto/scrypt/asm/scrypt-arm.S
 crypto/scrypt/asm/obj/asm-wrapper.o: crypto/scrypt/asm/asm-wrapper.cpp
 	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
-crypto/sha2/asm/obj/scrypt-arm.o: crypto/sha2/asm/sha2-x86.S
+crypto/sha2/asm/obj/sha2-x86.o: crypto/sha2/asm/sha2-x86.S
 	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
-crypto/sha2/asm/obj/scrypt-arm.o: crypto/sha2/asm/sha2-x86_64.S
+crypto/sha2/asm/obj/sha2-x86_64.o: crypto/sha2/asm/sha2-x86_64.S
 	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
-crypto/sha2/asm/obj/scrypt-arm.o: crypto/sha2/asm/sha2-arm.S
+crypto/sha2/asm/obj/sha2-arm.o: crypto/sha2/asm/sha2-arm.S
 	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
 DEFS += -DUSE_ASM
@@ -178,5 +178,7 @@ novacoind.exe: $(OBJS:obj/%=obj/%)
 clean:
 	-del /Q novacoind
 	-del /Q obj\*
+        -del /Q crypto\scrypt\asm\obj\*
+        -del /Q crypto\sha2\asm\obj\*
 
 FORCE:
diff --git a/src/makefile.osx b/src/makefile.osx
index feac13b..758c1ed 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -152,13 +152,13 @@ crypto/scrypt/asm/obj/scrypt-arm.o: crypto/scrypt/asm/scrypt-arm.S
 crypto/scrypt/asm/obj/asm-wrapper.o: crypto/scrypt/asm/asm-wrapper.cpp
 	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
-crypto/sha/asm/obj/sha-arm.o: crypto/sha2/asm/sha2-x86.S
+crypto/sha2/asm/obj/sha2-x86.o: crypto/sha2/asm/sha2-x86.S
 	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
-crypto/sha/asm/obj/sha-arm.o: crypto/sha2/asm/sha2-x86_64.S
+crypto/sha2/asm/obj/sha2-x86_64.o: crypto/sha2/asm/sha2-x86_64.S
 	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
-crypto/sha/asm/obj/sha-arm.o: crypto/sha2/asm/sha2-arm.S
+crypto/sha2/asm/obj/sha2-arm.o: crypto/sha2/asm/sha2-arm.S
 	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
 DEFS += -DUSE_ASM
@@ -213,6 +213,9 @@ clean:
 	-rm -f crypto/scrypt/generic/obj/*.o
 	-rm -f crypto/scrypt/generic/obj/*.P
 	-rm -f crypto/scrypt/generic/obj/*.d
+        -rm -f crypto/sha2/asm/obj/*.o
+        -rm -f crypto/sha2/asm/obj/*.P
+        -rm -f crypto/sha2/asm/obj/*.d
 	-rm -f obj/build.h
 
 FORCE:
diff --git a/src/makefile.unix b/src/makefile.unix
index 6f608ef..c983d21 100644
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -244,6 +244,9 @@ clean:
 	-rm -f crypto/scrypt/generic/obj/*.o
 	-rm -f crypto/scrypt/generic/obj/*.P
 	-rm -f crypto/scrypt/generic/obj/*.d
+        -rm -f crypto/sha2/asm/obj/*.o
+        -rm -f crypto/sha2/asm/obj/*.P
+        -rm -f crypto/sha2/asm/obj/*.d
 	-rm -f obj/build.h
 
 FORCE: