From 3a28a5fb1d16a2c187953665ed6c2c092d1fc46e Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Sun, 11 Feb 2018 20:18:44 -0700
Subject: [PATCH] Build without /usr/local/snark14

---
 INSTALL.kmr                             |   1 +
 Makefile                                |   2 +-
 include/DIGFile/DIG.h                   |   0
 include/DIGFile/DIGEndian.h             |   0
 include/DIGFile/DIGFile.h               |   0
 include/DIGFile/DOMTreeErrorReporter.h  |   0
 include/DIGFileSnark/DIGFileSnarkProj.h |   0
 include/DIGFileSnark/DIGFileSnarkRec.h  |   0
 include/DIGRand/DIGGauss.h              |   0
 include/DIGRand/DIGPoisson.h            |   0
 include/DIGRand/DIGRand.h               |   0
 src/DIGFile/Makefile                    |   6 +++---
 src/DIGFileSnark/Makefile               |   4 ++--
 src/DIGRand/Makefile                    |   4 ++--
 src/DIGRand/libDIGRand.so               | Bin 8568 -> 0 bytes
 15 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 INSTALL.kmr
 mode change 100755 => 100644 include/DIGFile/DIG.h
 mode change 100755 => 100644 include/DIGFile/DIGEndian.h
 mode change 100755 => 100644 include/DIGFile/DIGFile.h
 mode change 100755 => 100644 include/DIGFile/DOMTreeErrorReporter.h
 mode change 100755 => 100644 include/DIGFileSnark/DIGFileSnarkProj.h
 mode change 100755 => 100644 include/DIGFileSnark/DIGFileSnarkRec.h
 mode change 100755 => 100644 include/DIGRand/DIGGauss.h
 mode change 100755 => 100644 include/DIGRand/DIGPoisson.h
 mode change 100755 => 100644 include/DIGRand/DIGRand.h
 mode change 100755 => 100644 src/DIGFile/Makefile
 mode change 100755 => 100644 src/DIGFileSnark/Makefile
 mode change 100755 => 100644 src/DIGRand/Makefile
 delete mode 100755 src/DIGRand/libDIGRand.so

diff --git a/INSTALL.kmr b/INSTALL.kmr
new file mode 100644
index 0000000..33ded06
--- /dev/null
+++ b/INSTALL.kmr
@@ -0,0 +1 @@
+apt install libxerces-c-dev
diff --git a/Makefile b/Makefile
index 6d96e10..6fa1b40 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++
diff --git a/include/DIGFile/DIG.h b/include/DIGFile/DIG.h
old mode 100755
new mode 100644
diff --git a/include/DIGFile/DIGEndian.h b/include/DIGFile/DIGEndian.h
old mode 100755
new mode 100644
diff --git a/include/DIGFile/DIGFile.h b/include/DIGFile/DIGFile.h
old mode 100755
new mode 100644
diff --git a/include/DIGFile/DOMTreeErrorReporter.h b/include/DIGFile/DOMTreeErrorReporter.h
old mode 100755
new mode 100644
diff --git a/include/DIGFileSnark/DIGFileSnarkProj.h b/include/DIGFileSnark/DIGFileSnarkProj.h
old mode 100755
new mode 100644
diff --git a/include/DIGFileSnark/DIGFileSnarkRec.h b/include/DIGFileSnark/DIGFileSnarkRec.h
old mode 100755
new mode 100644
diff --git a/include/DIGRand/DIGGauss.h b/include/DIGRand/DIGGauss.h
old mode 100755
new mode 100644
diff --git a/include/DIGRand/DIGPoisson.h b/include/DIGRand/DIGPoisson.h
old mode 100755
new mode 100644
diff --git a/include/DIGRand/DIGRand.h b/include/DIGRand/DIGRand.h
old mode 100755
new mode 100644
diff --git a/src/DIGFile/Makefile b/src/DIGFile/Makefile
old mode 100755
new mode 100644
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
new mode 100644
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
new mode 100644
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
index 6026e550ba40834000637450ec6fe6eaec4d7a95..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8568
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

-- 
2.34.1