Build without /usr/local/snark14

diff --git a/INSTALL.kmr b/INSTALL.kmr
new file mode 100644 (file)
index 0000000..33ded06
--- /dev/null
+++ b/INSTALL.kmr
@@ -0,0 +1 @@
+apt install libxerces-c-dev

diff --git a/Makefile b/Makefile
index 6d96e10ae93491e936baac8029d3232ddede17a5..6fa1b40eee3c46eb8f875fcb1494ae75b2ddb30e 100644 (file)
--- 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++

diff --git a/include/DIGFile/DIG.h b/include/DIGFile/DIG.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/DIGFile/DIGEndian.h b/include/DIGFile/DIGEndian.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/DIGFile/DIGFile.h b/include/DIGFile/DIGFile.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/DIGFile/DOMTreeErrorReporter.h b/include/DIGFile/DOMTreeErrorReporter.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/DIGFileSnark/DIGFileSnarkProj.h b/include/DIGFileSnark/DIGFileSnarkProj.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/DIGFileSnark/DIGFileSnarkRec.h b/include/DIGFileSnark/DIGFileSnarkRec.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/DIGRand/DIGGauss.h b/include/DIGRand/DIGGauss.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/DIGRand/DIGPoisson.h b/include/DIGRand/DIGPoisson.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/DIGRand/DIGRand.h b/include/DIGRand/DIGRand.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/DIGFile/Makefile b/src/DIGFile/Makefile
old mode 100755 (executable)
new mode 100644 (file)
index 64d14e9..b52077f
--- a/src/DIGFile/Makefile
+++ b/src/DIGFile/Makefile
@@ -1,7 +1,7 @@
 # Makefile to build an instance of snark14
 
 ROOTDIR    = ../..
-XERCES     = /usr/local/snark14
+XERCES     = ../..
 
 CC         = gcc
 CXX        = g++
@@ -21,12 +21,12 @@ OBJ_CXX    = DIGEndian.o \
              DIGFile.o \
              DOMTreeErrorReporter.o
 
-INCLUDES   = -I/usr/include -I./include -I$(XERCES)/include \
+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 -lxerces-depdom
+LIBS      = $(LIBPATH) -lm -lxerces-c
 
 TARGET    = $(LIBDIR)/libDIGFile.so
 

diff --git a/src/DIGFileSnark/Makefile b/src/DIGFileSnark/Makefile
old mode 100755 (executable)
new mode 100644 (file)
index 7e10548..d6a223e
--- a/src/DIGFileSnark/Makefile
+++ b/src/DIGFileSnark/Makefile
@@ -1,7 +1,7 @@
 # Makefile to build an instance of snark14
 
 ROOTDIR    = ../..
-XERCES     = /usr/local/snark14
+XERCES     = ../..
 
 CC         = gcc
 CXX        = g++
@@ -24,7 +24,7 @@ INCLUDES   = -I/usr/include -I./include -I$(XERCES)/include \
              -I$(ROOTDIR)/include/DIGRand
 
 LIBPATH   = -L$(PREFIX)/lib -L$(XERCES)/lib
-LIBS      = $(LIBPATH) -lm -lxerces-c -lxerces-depdom
+LIBS      = $(LIBPATH) -lm -lxerces-c
 
 TARGET    = $(LIBDIR)/libDIGFileSnark.so
 

diff --git a/src/DIGRand/Makefile b/src/DIGRand/Makefile
old mode 100755 (executable)
new mode 100644 (file)
index 539c08d..35b40ad
--- a/src/DIGRand/Makefile
+++ b/src/DIGRand/Makefile
@@ -1,7 +1,7 @@
 # Makefile to build an instance of snark14
 
 ROOTDIR    = ../..
-XERCES     = /usr/local/snark14
+XERCES     = ../..
 
 CC         = gcc
 CXX        = g++
@@ -26,7 +26,7 @@ INCLUDES   = -I/usr/include -I./include -I$(XERCES)/include \
              -I$(ROOTDIR)/include/DIGRand
 
 LIBPATH   = -L$(PREFIX)/lib -L$(XERCES)/lib
-LIBS      = $(LIBPATH) -lm -lxerces-c -lxerces-depdom
+LIBS      = $(LIBPATH) -lm -lxerces-c
 
 TARGET    = $(LIBDIR)/libDIGRand.so
 

diff --git a/src/DIGRand/libDIGRand.so b/src/DIGRand/libDIGRand.so
deleted file mode 100755 (executable)
index 6026e55..0000000
Binary files a/src/DIGRand/libDIGRand.so and /dev/null differ