summaryrefslogtreecommitdiff
path: root/jcnf
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-09-01 14:02:47 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-09-01 14:02:47 +0200
commitebf181ce25f98bfdd5a6beb0327f7cfa10a39ac6 (patch)
tree30b4b81d186a06b64cd1ffb51236ec52a8e47e34 /jcnf
parent22f703cab05b7cd368f4de9e03991b7664dc5022 (diff)
parentd7f89e6fe63b8697fab5a901cfce457b375638b3 (diff)
Merge tag 'upstream/1.5.1'
Upstream version 1.5.1
Diffstat (limited to 'jcnf')
-rw-r--r--jcnf/Makefile.am15
-rw-r--r--jcnf/yajl/Makefile.am13
2 files changed, 0 insertions, 28 deletions
diff --git a/jcnf/Makefile.am b/jcnf/Makefile.am
deleted file mode 100644
index 1914fce..0000000
--- a/jcnf/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-include $(top_srcdir)/Makefile.shared
-
-SUBDIRS = $(YAJL_SUBDIRS)
-
-privatelib_LTLIBRARIES = libjcnf.la
-privatelibdir = $(pkglibdir)
-
-libjcnf_la_SOURCES = jcnf.h jcnf.c
-libjcnf_la_LIBADD = $(YAJL_LIBS)
-
-LDADD = ./libjcnf.la $(YAJL_LIBS)
-
-check_PROGRAMS = test
-
-EXTRA_DIST = Readme.txt
diff --git a/jcnf/yajl/Makefile.am b/jcnf/yajl/Makefile.am
deleted file mode 100644
index 5f477a9..0000000
--- a/jcnf/yajl/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-include $(top_srcdir)/Makefile.shared
-
-privatelib_LTLIBRARIES = libyajl.la
-privatelibdir = $(pkglibdir)
-
-libyajl_la_SOURCES = yajl_common.h yajl_gen.h yajl_parse.h yajl.c \
- yajl_alloc.c yajl_alloc.h yajl_buf.c yajl_buf.h yajl_encode.c \
- yajl_encode.h yajl_gen.c yajl_lex.c yajl_lex.h yajl_parser.c \
- yajl_parser.h
-
-LDADD = ./libyajl.la
-
-check_PROGRAMS = yajl_test json_verify