Merge branch '2.4'
This commit is contained in:
commit
6279610ce4
@ -1,6 +1,6 @@
|
|||||||
check_PROGRAMS = json_process
|
check_PROGRAMS = json_process
|
||||||
|
|
||||||
AM_CPPFLAGS = -I$(top_srcdir)/src
|
AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src
|
||||||
AM_CFLAGS = -Wall -Werror
|
AM_CFLAGS = -Wall -Werror
|
||||||
LDFLAGS = -static # for speed and Valgrind
|
LDFLAGS = -static # for speed and Valgrind
|
||||||
LDADD = $(top_builddir)/src/libjansson.la
|
LDADD = $(top_builddir)/src/libjansson.la
|
||||||
|
@ -29,7 +29,7 @@ test_pack_SOURCES = test_pack.c util.h
|
|||||||
test_simple_SOURCES = test_simple.c util.h
|
test_simple_SOURCES = test_simple.c util.h
|
||||||
test_unpack_SOURCES = test_unpack.c util.h
|
test_unpack_SOURCES = test_unpack.c util.h
|
||||||
|
|
||||||
AM_CPPFLAGS = -I$(top_srcdir)/src
|
AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src
|
||||||
AM_CFLAGS = -Wall -Werror
|
AM_CFLAGS = -Wall -Werror
|
||||||
LDFLAGS = -static # for speed and Valgrind
|
LDFLAGS = -static # for speed and Valgrind
|
||||||
LDADD = $(top_builddir)/src/libjansson.la
|
LDADD = $(top_builddir)/src/libjansson.la
|
||||||
|
Loading…
Reference in New Issue
Block a user