Move building of libsnark14.so to top level Makefile.

diff --git a/Makefile b/Makefile
index 874f5fcd923710aa51269f5e192ed68f55663941..d0b28e2fb513b6fca367c715f2ce2bc92dbda59d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,8 @@ CC         = gcc
 CXX        = g++
 LD         = g++
 
-CFLAGS    = -O4 -fPIC -DLINUX -D_REENTRANT -w -Wunused-parameter
-CXXFLAGS  = -O4 -fPIC -DLINUX -D_REENTRANT -w -Wunused-parameter
+CFLAGS    = -O4 -msse4 -fPIC -DLINUX -D_REENTRANT -w -Wunused-parameter
+CXXFLAGS  = -O4 -msse4 -fPIC -DLINUX -D_REENTRANT -w -Wunused-parameter
 
 LDFLAGS   = 
 
@@ -25,7 +25,7 @@ LIBSDIR    = lib
 LDIGFILED  = $(LIBSDIR)/libDIGFile.so
 LDIGFILESD = $(LIBSDIR)/libDIGFileSnark.so
 LDIGFILERD = $(LIBSDIR)/libDIGRand.so
-LSNARK14   = $(LIBSDIR)/libsnark14.so
+LSNARK14D  = $(LIBSDIR)/libsnark14.so
 
 SRC_CXX    = $(foreach dir,src/snark,$(wildcard src/snark/*.cpp))
 SRC_C      = $(foreach dir,src/snark,$(wildcard src/snark/*.c))
@@ -44,11 +44,15 @@ DISPLAY    = snark14Display
 DISPLAY_SRC  = $(foreach dir,tools/Display,$(wildcard tools/Display/*.cpp))
 DISPLAY_INC  = $(foreach dir,tools/Display,$(wildcard tools/Display/*.hpp))
  
-all: $(OBJDIR) $(LIBSDIR) $(BINDIR) $(BINDIR)/$(SNARK14) $(BINDIR)/$(DISPLAY) $(BINDIR)/$(INPUT) $(LSNARK14)
+all: $(OBJDIR) $(LIBSDIR) $(BINDIR) $(BINDIR)/$(SNARK14) $(BINDIR)/$(DISPLAY) $(BINDIR)/$(INPUT) $(LSNARK14D)
 
 $(BINDIR)/$(SNARK14): $(LDIGFILED) $(LDIGFILESD) $(LDIGFILERD) $(OBJ_C) $(OBJ_CXX)
        $(LD) $(LIBPATH) $(LDFLAGS) $(OBJ_C) $(OBJ_CXX) $(LIBS) -o bin/$(SNARK14)
 
+# Does not link correctly with shared library file libsnark14.so
+#$(BINDIR)/$(SNARK14): $(LDIGFILED) $(LDIGFILESD) $(LDIGFILERD) $(LSNARK14D)
+#      $(LD) $(LIBPATH) $(LDFLAGS) -o bin/$(SNARK14) $(LIBS) -lsnark14
+
 $(BINDIR)/$(DISPLAY): $(DISPLAY_SRC) $(DISPLAY_INC)
        cd tools/Display ; make
 
@@ -75,8 +79,9 @@ $(LDIGFILESD) : $(DIGFILESD)
 $(LDIGFILERD) : $(DIGFILERD)
        $(MAKE) --directory=$<
 
-$(LSNARK14) : $(SNARK14D) $(BINDIR)/$(SNARK14)
-       $(MAKE) --directory=$<
+# Make shared library
+$(LSNARK14D) : $(OBJ_CXX) $(OBJ_C)
+       $(LD) --shared $(LDFLAGS) -o $(LSNARK14D) $(OBJ_CXX) $(OBJ_C) $(LIBS)
 
 $(OBJDIR):
        @mkdir -p $@

diff --git a/src/snark/Makefile b/src/snark/Makefile
deleted file mode 100644 (file)
index d22e236..0000000
--- a/src/snark/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# Makefile to build an instance of snark14
-
-ROOTDIR    = ../..
-XERCES     = ../..
-
-CC         = gcc
-CXX        = g++
-LD         = g++
-
-LIBDIR    = $(ROOTDIR)/lib
-
-CFLAGS  = -O4 -fPIC -DLINUX -D_REENTRANT -w -Wunused-parameter
-CXXFLAGS  = -O4 -fPIC -DLINUX -D_REENTRANT -w -Wunused-parameter
-
-LDFLAGS   = 
-
-SRC_CXX    = $(foreach dir,.,$(wildcard ./*.cpp))
-SRC_CC     = $(foreach dir,.,$(wildcard ./*.c))
-OBJ_CXX    = $(patsubst ./%.cpp,../../build/%.o,$(SRC_CXX))
-OBJ_CC     = $(patsubst ./%.c,../../build/%.o,$(SRC_CC))
-
-INCLUDES   = -I/usr/include -I./include -I$(XERCES) -I$(XERCES)/include \
-             -I$(ROOTDIR)/include/DIGFile -I$(ROOTDIR)/include/DIGFileSnark \
-             -I$(ROOTDIR)/include/DIGRand
-
-LIBPATH   = -L$(PREFIX)/lib -L$(XERCES)/lib
-LIBS      = $(LIBPATH) -lm -lxerces-c
-
-TARGET    = $(LIBDIR)/libsnark14.so
-
-.PHONY: all
-
-all: $(LIBDIR) $(TARGET)
-
-$(TARGET): $(OBJ_CXX) $(OBJ_CC)
-       $(LD) --shared $(LIBS) $(LDFLAGS) -o $(TARGET) $(OBJ_CXX) $(OBJ_CC)
-
-../../build/%.o : ./%.c .deps/%.Po
-       $(CC) -c $(CFLAGS) $(INCLUDES) -MT $@ -MD -MP -MF $(word 2,$^) -o $@ $<
-
-../../build/%.o : ./%.cpp .deps/%.Po
-       $(CXX) -c $(CXXFLAGS) $(INCLUDES) -MT $@ -MD -MP -MF $(word 2,$^) -o $@ $<
-
-$(LIBDIR) :
-       @mkdir -p $(LIBDIR)
-
-clean:
-       @rm -rf $(OBJ_CXX) $(TARGET)
-