Building example programs, but libsnark.so not yet made

[snark14.git] / Makefile

diff --git a/Makefile b/Makefile
index 6fa1b40eee3c46eb8f875fcb1494ae75b2ddb30e..cd3e3d3ab48451a3641be8d64d05edb0dc3292b6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ LDFLAGS   =
 DIGFILED   = $(PREFIX)/src/DIGFile
 DIGFILESD  = $(PREFIX)/src/DIGFileSnark
 DIGFILERD  = $(PREFIX)/src/DIGRand
+SNARK14D   = $(PREFIX)/src/snark14
 
 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,10 @@ $(LDIGFILESD) : $(DIGFILESD)
 $(LDIGFILERD) : $(DIGFILERD)
        $(MAKE) --directory=$<
 
+
+$(LSNARK14) : $(SNARK14D)
+       $(MAKE) --directory=$<
+
 $(OBJDIR):
        @mkdir -p $@