X-Git-Url: http://git.kpe.io/?p=snark14.git;a=blobdiff_plain;f=Makefile;h=6f4b774f22f1e5d4435fe04d57e346b654c8a05e;hp=e0b36a68847f74ca2ee554dd81f864c0af0668a9;hb=7f00420c23e31db8b519ea7d665e5a74f3d9d980;hpb=4b9c63b0ad3bac6407cf563e382746a7f5ba8aec

diff --git a/Makefile b/Makefile
index e0b36a6..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,15 +24,17 @@ 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))
 OBJ_CXX    = $(patsubst src/snark/%.cpp,build/%.o,$(SRC_CXX))
 OBJ_C      = $(patsubst src/snark/%.c,build/%.o,$(SRC_C))
-INCLUDES   = -I./include -I$(XERCES)/include $(addprefix -I,$(DIGFILED),$(DIGFILESD),$(DIGFILERD)) -Iinclude/DIGFile -Iinclude/DIGFileSnark -Iinclude/DIGRand -I/usr/include
+INCLUDES   = -I./include $(addprefix -I,$(DIGFILED),$(DIGFILESD),$(DIGFILERD)) -Iinclude/DIGFile -Iinclude/DIGFileSnark -Iinclude/DIGRand -I/usr/include
 
-LIBPATH   = -L$(PREFIX)/lib -L$(XERCES)/lib
-LIBS      = $(LIBPATH) -lm -lxerces-c -lxerces-depdom -lDIGFile -lDIGFileSnark -lDIGRand
+#LIBPATH   = -L$(PREFIX)/lib -L$(XERCES)/lib
+LIBPATH   = -L$(PREFIX)/lib
+LIBS      = $(LIBPATH) -lm -lxerces-c -lDIGFile -lDIGFileSnark -lDIGRand
 
 SNARK14    = snark14
 INPUT      = snark14Input
@@ -43,8 +46,8 @@ 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)
-	$(LD) $(LIBS) $(LDFLAGS) -o bin/$(SNARK14) $(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)
 	cd tools/Display ; make
@@ -70,6 +73,9 @@ $(LDIGFILESD) : $(DIGFILESD)
 $(LDIGFILERD) : $(DIGFILERD)
 	$(MAKE) --directory=$<
 
+$(LSNARK14) : $(SNARK14D)
+	$(MAKE) --directory=$<
+
 $(OBJDIR):
 	@mkdir -p $@