X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=Makefile;h=6f4b774f22f1e5d4435fe04d57e346b654c8a05e;hb=dc882847d273019ffaa26b1069fabf5abe9337f6;hp=6d96e10ae93491e936baac8029d3232ddede17a5;hpb=e08781393afc0bd73e7335a36003b39ccc11122f;p=snark14.git

diff --git a/Makefile b/Makefile
index 6d96e10..6f4b774 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Makefile to build an instance of snark14
 
 PREFIX     = .
-XERCES     = /usr/local/snark14
+XERCES     = ~/snark14kmr
 
 CC         = gcc
 CXX        = g++
@@ -15,6 +15,7 @@ LDFLAGS   =
 DIGFILED   = $(PREFIX)/src/DIGFile
 DIGFILESD  = $(PREFIX)/src/DIGFileSnark
 DIGFILERD  = $(PREFIX)/src/DIGRand
+SNARK14D   = $(PREFIX)/src/snark
 
 OBJDIR     = build
 BINDIR     = bin
@@ -23,6 +24,7 @@ LIBSDIR    = lib
 LDIGFILED  = $(LIBSDIR)/libDIGFile.so
 LDIGFILESD = $(LIBSDIR)/libDIGFileSnark.so
 LDIGFILERD = $(LIBSDIR)/libDIGRand.so
+LSNARK14   = $(LIBSDIR)/libsnark14.a
 
 SRC_CXX    = $(foreach dir,src/snark,$(wildcard src/snark/*.cpp))
 SRC_C      = $(foreach dir,src/snark,$(wildcard src/snark/*.c))
@@ -44,7 +46,7 @@ DISPLAY_INC  = $(foreach dir,tools/Display,$(wildcard tools/Display/*.hpp))
 
 all: $(OBJDIR) $(LIBSDIR) $(BINDIR) $(BINDIR)/$(SNARK14) $(BINDIR)/$(DISPLAY) $(BINDIR)/$(INPUT)
 
-$(BINDIR)/$(SNARK14): $(LDIGFILED) $(LDIGFILESD) $(LDIGFILERD) $(OBJ_C) $(OBJ_CXX)
+$(BINDIR)/$(SNARK14): $(LDIGFILED) $(LDIGFILESD) $(LDIGFILERD) $(OBJ_C) $(OBJ_CXX) $(LSNARK14)
 	$(LD) $(LIBPATH) $(LDFLAGS) $(OBJ_C) $(OBJ_CXX) $(LIBS) -o bin/$(SNARK14)
 
 $(BINDIR)/$(DISPLAY): $(DISPLAY_SRC) $(DISPLAY_INC)
@@ -71,6 +73,9 @@ $(LDIGFILESD) : $(DIGFILESD)
 $(LDIGFILERD) : $(DIGFILERD)
 	$(MAKE) --directory=$<
 
+$(LSNARK14) : $(SNARK14D)
+	$(MAKE) --directory=$<
+
 $(OBJDIR):
 	@mkdir -p $@