projects / snark14.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 11924d4)
Building example programs, but libsnark.so not yet made
authorKevin M. Rosenberg <kevin@rosenberg.net>
Mon, 12 Feb 2018 05:01:50 +0000 (22:01 -0700)
committerKevin M. Rosenberg <kevin@rosenberg.net>
Mon, 12 Feb 2018 05:01:50 +0000 (22:01 -0700)
17 files changed:
Makefile patch | blob | history
examples/b1/snark.lock [deleted file] patch | blob | history
examples/b2/src/Makefile patch | blob | history
examples/b9/src/Makefile patch | blob | history
tools/Display/moc_openimages.cpp patch | blob | history
tools/Display/moc_range.cpp patch | blob | history
tools/Display/moc_selectEvalExecutions.cpp patch | blob | history
tools/Display/moc_selectimages.cpp patch | blob | history
tools/Input/moc_mode.cpp patch | blob | history
tools/Input/moc_picture.cpp patch | blob | history
tools/Input/moc_projection.cpp patch | blob | history
tools/Input/moc_punch.cpp patch | blob | history
tools/Input/moc_select.cpp patch | blob | history
tools/Input/moc_skunk.cpp patch | blob | history
tools/Input/moc_stop.cpp patch | blob | history
tools/Input/moc_super.cpp patch | blob | history
tools/Input/moc_trace.cpp patch | blob | history

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 $@
 
diff --git a/examples/b1/snark.lock b/examples/b1/snark.lock
deleted file mode 100644 (file)
index 84e0d24..0000000
--- a/examples/b1/snark.lock
+++ /dev/null
@@ -1 +0,0 @@
-2660
diff --git a/examples/b2/src/Makefile b/examples/b2/src/Makefile
index bf3ba58632b2dcf2ec81b3a3f53f6431e467cc2a..f1373e72ca05dafd840e31e5eca2f8c56c4659ca 100644 (file)
--- a/examples/b2/src/Makefile
+++ b/examples/b2/src/Makefile
@@ -1,27 +1,26 @@
 #
-
 ifndef SNARKINCLUDE
-SNARKINCLUDE=/usr/local/snark14/src/snark14/snark
+SNARKINCLUDE=../../../src/snark
 endif
 
 ifndef SNARKLIBDIR
-SNARKLIBDIR=/usr/local/snark14/lib
+SNARKLIBDIR=../../../lib
 endif
 
 ifndef SNARKLIBINCLUDEDIR
-SNARKLIBINCLUDEDIR=/usr/local/snark14/include
+SNARKLIBINCLUDEDIR=../../../include
 endif
 
 ifndef DIGFILEINCLUDE
-DIGFILEINCLUDE=/usr/local/snark14/include/DIGFile
+DIGFILEINCLUDE=../../../include/DIGFile
 endif
 
 ifndef DIGFILESNARKINCLUDE
-DIGFILESNARKINCLUDE=/usr/local/snark14/include/DIGFileSnark
+DIGFILESNARKINCLUDE=../../../include/DIGFileSnark
 endif
 
 ifndef DIGRANDINCLUDE
-DIGRANDINCLUDE=/usr/local/snark14/include/DIGRand
+DIGRANDINCLUDE=../../../include/DIGRand
 endif
 
 OUTDIR=../bin
diff --git a/examples/b9/src/Makefile b/examples/b9/src/Makefile
index d0a1c0f8a7a2936b22f14978c91cf371a2bb48cd..fe8d6b1128202b401c0957785c0c7465f499d882 100644 (file)
--- a/examples/b9/src/Makefile
+++ b/examples/b9/src/Makefile
@@ -1,39 +1,40 @@
 #
 
 ifndef SNARKINCLUDE
-SNARKINCLUDE=/usr/local/snark14/src/snark14/snark
+SNARKINCLUDE=../../../include
 endif
 
 ifndef SNARKLIBDIR
-SNARKLIBDIR=/usr/local/snark14/lib
+SNARKLIBDIR=../../../lib
 endif
 
 ifndef SNARKLIBINCLUDEDIR
-SNARKLIBINCLUDEDIR=/usr/local/snark14/include
+SNARKLIBINCLUDEDIR=../../../include
 endif
 
 ifndef DIGFILEINCLUDE
-DIGFILEINCLUDE=/usr/local/snark14/include/DIGFile
+DIGFILEINCLUDE=../../../include/DIGFile
 endif
 
 ifndef DIGFILESNARKINCLUDE
-DIGFILESNARKINCLUDE=/usr/local/snark14/include/DIGFileSnark
+DIGFILESNARKINCLUDE=../../../include/DIGFileSnark
 endif
 
 ifndef DIGRANDINCLUDE
-DIGRANDINCLUDE=/usr/local/snark14/include/DIGRand
+DIGRANDINCLUDE=../../../include/DIGRand
 endif
 
 OUTDIR=../bin
 
 INCLUDEDIR = -I/usr/include -I$(XERCESINCLUDE)/.. \
 -I$(DIGFILEINCLUDE) -I$(DIGFILESNARKINCLUDE) -I$(DIGRANDINCLUDE) -I$(SNARKINCLUDE) \
--I$(SNARKLIBINCLUDEDIR)
+-I$(SNARKLIBINCLUDEDIR) -I../../../src/snark
 
 OBJ = \
        user_fom1.o
 
-LIBS= -L$(SNARKLIBDIR) -lsnark14 -lDIGFile -lDIGFileSnark -lDIGRand  -lxerces-c -lm
+LIBS= -L$(SNARKLIBDIR) -L../../../src/snark -lDIGFile -lDIGFileSnark -lDIGRand  -lxerces-c -lm
+#LIBS= -L$(SNARKLIBDIR) -L../../../src/snark -lsnark14 -lDIGFile -lDIGFileSnark -lDIGRand  -lxerces-c -lm
 
 
 #ifndef CC
diff --git a/tools/Display/moc_openimages.cpp b/tools/Display/moc_openimages.cpp
index e6a89791cd2e3c804c90a30b673f0ff2bb2b144e..7068c0399c55c9daa2015f8bbd1d0efb06fc7cd2 100644 (file)
--- a/tools/Display/moc_openimages.cpp
+++ b/tools/Display/moc_openimages.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** openimageswindow meta object code from reading C++ file 'openimages.hpp'
 **
-** Created: Sun Feb 11 21:03:22 2018
+** Created: Sun Feb 11 21:45:02 2018
 **      by: The Qt MOC ($Id: qt/moc_yacc.cpp   3.3.8   edited Feb 2 14:59 $)
 **
 ** WARNING! All changes made in this file will be lost!
diff --git a/tools/Display/moc_range.cpp b/tools/Display/moc_range.cpp
index 4d5c6996aa81699c45150dbd0c45d4b7283de76c..f66be7dd4e46d5941bc90d261ad57abc7f7b5768 100644 (file)
--- a/tools/Display/moc_range.cpp
+++ b/tools/Display/moc_range.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** rangewindow meta object code from reading C++ file 'range.hpp'
 **
-** Created: Sun Feb 11 21:03:22 2018
+** Created: Sun Feb 11 21:45:03 2018
 **      by: The Qt MOC ($Id: qt/moc_yacc.cpp   3.3.8   edited Feb 2 14:59 $)
 **
 ** WARNING! All changes made in this file will be lost!
diff --git a/tools/Display/moc_selectEvalExecutions.cpp b/tools/Display/moc_selectEvalExecutions.cpp
index fcb0ea92735396d5dc03ca02f468a670db258a38..0ce9487c9d14d116ba4dc4efa44b4dce2b2cf9a0 100644 (file)
--- a/tools/Display/moc_selectEvalExecutions.cpp
+++ b/tools/Display/moc_selectEvalExecutions.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** selectEvalExecutionsWindow meta object code from reading C++ file 'selectEvalExecutions.hpp'
 **
-** Created: Sun Feb 11 21:03:22 2018
+** Created: Sun Feb 11 21:45:03 2018
 **      by: The Qt MOC ($Id: qt/moc_yacc.cpp   3.3.8   edited Feb 2 14:59 $)
 **
 ** WARNING! All changes made in this file will be lost!
diff --git a/tools/Display/moc_selectimages.cpp b/tools/Display/moc_selectimages.cpp
index 8e044a6f193770c753428541c1b8502247c8ab68..3cd512007bb72c434f002048848ee5cdfd7d7c41 100644 (file)
--- a/tools/Display/moc_selectimages.cpp
+++ b/tools/Display/moc_selectimages.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** selectimageswindow meta object code from reading C++ file 'selectimages.hpp'
 **
-** Created: Sun Feb 11 21:03:23 2018
+** Created: Sun Feb 11 21:45:04 2018
 **      by: The Qt MOC ($Id: qt/moc_yacc.cpp   3.3.8   edited Feb 2 14:59 $)
 **
 ** WARNING! All changes made in this file will be lost!
diff --git a/tools/Input/moc_mode.cpp b/tools/Input/moc_mode.cpp
index 58737a391c674a477370396c941ab7a6d9b599db..a9f4e42ca2bcfb5114d6749ff2c4a3de6d049c4d 100644 (file)
--- a/tools/Input/moc_mode.cpp
+++ b/tools/Input/moc_mode.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** modewindow meta object code from reading C++ file 'mode.h'
 **
-** Created: Sun Feb 11 21:07:22 2018
+** Created: Sun Feb 11 21:45:22 2018
 **      by: The Qt MOC ($Id: qt/moc_yacc.cpp   3.3.8   edited Feb 2 14:59 $)
 **
 ** WARNING! All changes made in this file will be lost!
diff --git a/tools/Input/moc_picture.cpp b/tools/Input/moc_picture.cpp
index 10f17eeac35e5b7d0523bff40b48c1900cc4e386..15da43394ebac9aeb5b61288e8365344f8134b5a 100644 (file)
--- a/tools/Input/moc_picture.cpp
+++ b/tools/Input/moc_picture.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** picturewindow meta object code from reading C++ file 'picture.h'
 **
-** Created: Sun Feb 11 21:07:22 2018
+** Created: Sun Feb 11 21:45:23 2018
 **      by: The Qt MOC ($Id: qt/moc_yacc.cpp   3.3.8   edited Feb 2 14:59 $)
 **
 ** WARNING! All changes made in this file will be lost!
diff --git a/tools/Input/moc_projection.cpp b/tools/Input/moc_projection.cpp
index 3ec5906378453a6def8709db173ddd5c9eaa3e3e..f2959eb5e4765069c0a404ee9cd0f16592c09817 100644 (file)
--- a/tools/Input/moc_projection.cpp
+++ b/tools/Input/moc_projection.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** projectionwindow meta object code from reading C++ file 'projection.h'
 **
-** Created: Sun Feb 11 21:07:23 2018
+** Created: Sun Feb 11 21:45:23 2018
 **      by: The Qt MOC ($Id: qt/moc_yacc.cpp   3.3.8   edited Feb 2 14:59 $)
 **
 ** WARNING! All changes made in this file will be lost!
diff --git a/tools/Input/moc_punch.cpp b/tools/Input/moc_punch.cpp
index a4f429bbb6c20ebfe96658c273ab144e8087cba9..73c04453b79f4fe5fbb2a5ebadc26ef9b604de97 100644 (file)
--- a/tools/Input/moc_punch.cpp
+++ b/tools/Input/moc_punch.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** punchwindow meta object code from reading C++ file 'punch.h'
 **
-** Created: Sun Feb 11 21:07:23 2018
+** Created: Sun Feb 11 21:45:24 2018
 **      by: The Qt MOC ($Id: qt/moc_yacc.cpp   3.3.8   edited Feb 2 14:59 $)
 **
 ** WARNING! All changes made in this file will be lost!
diff --git a/tools/Input/moc_select.cpp b/tools/Input/moc_select.cpp
index 53b9cce96ecb525271a6b14c17ed28fe3798f8a4..8e84086039bc64dd18832daa08c3ee4201d1e7d4 100644 (file)
--- a/tools/Input/moc_select.cpp
+++ b/tools/Input/moc_select.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** selectwindow meta object code from reading C++ file 'select.h'
 **
-** Created: Sun Feb 11 21:07:23 2018
+** Created: Sun Feb 11 21:45:24 2018
 **      by: The Qt MOC ($Id: qt/moc_yacc.cpp   3.3.8   edited Feb 2 14:59 $)
 **
 ** WARNING! All changes made in this file will be lost!
diff --git a/tools/Input/moc_skunk.cpp b/tools/Input/moc_skunk.cpp
index 53396d8b41fba35e5cd273f2d2b3abd2e1db69fc..f02eaf1884347c8c0693081a7dad5663d978c0bb 100644 (file)
--- a/tools/Input/moc_skunk.cpp
+++ b/tools/Input/moc_skunk.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** skunkwindow meta object code from reading C++ file 'skunk.h'
 **
-** Created: Sun Feb 11 21:07:24 2018
+** Created: Sun Feb 11 21:45:25 2018
 **      by: The Qt MOC ($Id: qt/moc_yacc.cpp   3.3.8   edited Feb 2 14:59 $)
 **
 ** WARNING! All changes made in this file will be lost!
diff --git a/tools/Input/moc_stop.cpp b/tools/Input/moc_stop.cpp
index c5f5b2a0799feef737661effa457d4914b24b402..1880219da8a788289e994d099b7af9ce84787f28 100644 (file)
--- a/tools/Input/moc_stop.cpp
+++ b/tools/Input/moc_stop.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** stopwindow meta object code from reading C++ file 'stop.h'
 **
-** Created: Sun Feb 11 21:07:24 2018
+** Created: Sun Feb 11 21:45:25 2018
 **      by: The Qt MOC ($Id: qt/moc_yacc.cpp   3.3.8   edited Feb 2 14:59 $)
 **
 ** WARNING! All changes made in this file will be lost!
diff --git a/tools/Input/moc_super.cpp b/tools/Input/moc_super.cpp
index bf28bdf44bf664f7ef8a7a6212ee82b7e45c96e9..fa3ef1a7040dc171d004c25f31d28b96d477e6e2 100644 (file)
--- a/tools/Input/moc_super.cpp
+++ b/tools/Input/moc_super.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** superwindow meta object code from reading C++ file 'super.h'
 **
-** Created: Sun Feb 11 21:07:24 2018
+** Created: Sun Feb 11 21:45:26 2018
 **      by: The Qt MOC ($Id: qt/moc_yacc.cpp   3.3.8   edited Feb 2 14:59 $)
 **
 ** WARNING! All changes made in this file will be lost!
diff --git a/tools/Input/moc_trace.cpp b/tools/Input/moc_trace.cpp
index f96ea17e5bd22222942f7944d5169d1b75d72c9d..43772a8a25a19082dc12c2e8005df96b5cb02b9f 100644 (file)
--- a/tools/Input/moc_trace.cpp
+++ b/tools/Input/moc_trace.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** tracewindow meta object code from reading C++ file 'trace.h'
 **
-** Created: Sun Feb 11 21:07:25 2018
+** Created: Sun Feb 11 21:45:26 2018
 **      by: The Qt MOC ($Id: qt/moc_yacc.cpp   3.3.8   edited Feb 2 14:59 $)
 **
 ** WARNING! All changes made in this file will be lost!
Local SNARK14m branch