Skip to content

Commit 66ec621

Browse files
committed
Added Jansson as submodule.
1 parent ecdb8ac commit 66ec621

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+501
-5735
lines changed

.gitmodules

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[submodule "jansson"]
2+
path = submodules/jansson
3+
url = https://github.com/akheron/jansson.git
4+

Makefile.am

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11

22
ACLOCAL_AMFLAGS = -I m4
33

4-
JANSSON_CPPFLAGS= -I$(top_builddir)/compat/jansson-2.5/src -I$(top_srcdir)/compat/jansson-2.5/src
4+
JANSSON_CPPFLAGS= -I$(top_builddir)/submodules/jansson/src -I$(top_srcdir)/submodules/jansson/src
55

66
EXTRA_DIST = example.conf m4/gnulib-cache.m4 \
77
ADL_SDK/readme.txt api-example.php miner.php \
88
API.class API.java api-example.c hexdump.c \
99
doc/API doc/FAQ doc/GPU doc/SCRYPT doc/windows-build.txt
1010

11-
SUBDIRS = lib compat ccan sph
11+
SUBDIRS = lib submodules ccan sph
1212

1313
bin_PROGRAMS = sgminer
1414

api-example.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
/* Compile:
11-
* gcc api-example.c -Icompat/jansson-2.5 -Icompat/libusb-1.0/libusb -o sgminer-api
11+
* gcc api-example.c -Isubmodules/jansson -Icompat/libusb-1.0/libusb -o sgminer-api
1212
*/
1313

1414
#include "config.h"

compat/.gitignore

-3
This file was deleted.

compat/Makefile.am

-3
This file was deleted.

0 commit comments

Comments
 (0)