From: Kevin M. Rosenberg Date: Mon, 12 Feb 2018 05:01:50 +0000 (-0700) Subject: Building example programs, but libsnark.so not yet made X-Git-Url: http://git.kpe.io/?p=snark14.git;a=commitdiff_plain;h=2ac93173052548d00e6b3d980b64bfaed7b1b96c Building example programs, but libsnark.so not yet made --- diff --git a/Makefile b/Makefile index 6fa1b40..cd3e3d3 100644 --- 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 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 bf3ba58..f1373e7 100644 --- 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 d0a1c0f..fe8d6b1 100644 --- 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 e6a8979..7068c03 100644 --- 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 4d5c699..f66be7d 100644 --- 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 fcb0ea9..0ce9487 100644 --- 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 8e044a6..3cd5120 100644 --- 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 58737a3..a9f4e42 100644 --- 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 10f17ee..15da433 100644 --- 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 3ec5906..f2959eb 100644 --- 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 a4f429b..73c0445 100644 --- 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 53b9cce..8e84086 100644 --- 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 53396d8..f02eaf1 100644 --- 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 c5f5b2a..1880219 100644 --- 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 bf28bdf..fa3ef1a 100644 --- 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 f96ea17..43772a8 100644 --- 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!