Added Jansson as submodule.

sgminer-dev · Jul 2, 2014 · 66ec621 · 66ec621 · Bllacky · Jul 2, 2014
1 parent ecdb8ac
commit 66ec621
Show file tree

Hide file tree

Showing 43 changed files with 501 additions and 5,735 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "jansson"]
+  path = submodules/jansson
+  url = https://github.com/akheron/jansson.git
+
diff --git a/Makefile.am b/Makefile.am
@@ -1,14 +1,14 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-JANSSON_CPPFLAGS= -I$(top_builddir)/compat/jansson-2.5/src -I$(top_srcdir)/compat/jansson-2.5/src
+JANSSON_CPPFLAGS= -I$(top_builddir)/submodules/jansson/src -I$(top_srcdir)/submodules/jansson/src
 
 EXTRA_DIST	= example.conf m4/gnulib-cache.m4 \
 		  ADL_SDK/readme.txt api-example.php miner.php	\
 		  API.class API.java api-example.c hexdump.c \
 		  doc/API doc/FAQ doc/GPU doc/SCRYPT doc/windows-build.txt
 
-SUBDIRS		= lib compat ccan sph
+SUBDIRS		= lib submodules ccan sph
 
 bin_PROGRAMS     = sgminer
 

diff --git a/api-example.c b/api-example.c
@@ -8,7 +8,7 @@
  */
 
 /* Compile:
- *   gcc api-example.c -Icompat/jansson-2.5 -Icompat/libusb-1.0/libusb -o sgminer-api
+ *   gcc api-example.c -Isubmodules/jansson -Icompat/libusb-1.0/libusb -o sgminer-api
  */
 
 #include "config.h"

diff --git a/compat/.gitignore b/compat/.gitignore
diff --git a/compat/Makefile.am b/compat/Makefile.am