rshen/c-capnproto
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename to "[lib]capnp_c", use lib/ subdir

Browse source
This commit is contained in:
David Lamparter 2016-03-18 23:36:07 +01:00
parent d3b1cad50f
commit 811d3046e1
12 changed files with 28 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Makefile.am
View file

@ -9,25 +9,26 @@ noinst_HEADERS =
include_HEADERS =
AM_CPPFLAGS = -I${srcdir}/lib
lib_LTLIBRARIES += libcapn.la
libcapn_la_LDFLAGS = -version-info 1:0:0
libcapn_la_SOURCES = \
capn-malloc.c \
capn-stream.c \
capn.c
lib_LTLIBRARIES += libcapnp_c.la
libcapnp_c_la_LDFLAGS = -version-info 0:0:0
libcapnp_c_la_SOURCES = \
lib/capn-malloc.c \
lib/capn-stream.c \
lib/capn.c
EXTRA_DIST += \
lib/capn-list.inc
bin_PROGRAMS += capnpc-c
capnpc_c_SOURCES = \
compiler/capnpc-c.c \
compiler/schema.capnp.c \
compiler/str.c
capnpc_c_LDADD = libcapn.la
capnpc_c_LDADD = libcapnp_c.la
include_HEADERS += \
capn.h
lib/capnp_c.h
EXTRA_DIST += \
capn-list.inc
noinst_HEADERS += \
compiler/str.h \
compiler/schema.capnp.h \
@ -45,6 +46,6 @@ capn_test_SOURCES = \
compiler/schema-test.cpp \
compiler/schema.capnp.c
capn_test_CFLAGS = $(GTEST_CFLAGS)
capn_test_LDADD = libcapn.la $(GTEST_LDFLAGS)
capn_test_LDADD = libcapnp_c.la $(GTEST_LDFLAGS)
TESTS = capn-test
endif

4
compiler/c++.capnp.h
View file

@ -1,10 +1,10 @@
#ifndef CAPN_BDF87D7BB8304E81
#define CAPN_BDF87D7BB8304E81
/* AUTO GENERATED - DO NOT EDIT */
#include <capn.h>
#include <capnp_c.h>
#if CAPN_VERSION != 1
#error "version mismatch between capn.h and generated code"
#error "version mismatch between capnp_c.h and generated code"
#endif

4
compiler/capnpc-c.c
View file

@ -1185,9 +1185,9 @@ int main() {
str_addf(&HDR, "#ifndef CAPN_%X%X\n", (uint32_t) (file_node->n.id >> 32), (uint32_t) file_node->n.id);
str_addf(&HDR, "#define CAPN_%X%X\n", (uint32_t) (file_node->n.id >> 32), (uint32_t) file_node->n.id);
str_addf(&HDR, "/* AUTO GENERATED - DO NOT EDIT */\n");
str_addf(&HDR, "#include <capn.h>\n\n");
str_addf(&HDR, "#include <capnp_c.h>\n\n");
str_addf(&HDR, "#if CAPN_VERSION != 1\n");
str_addf(&HDR, "#error \"version mismatch between capn.h and generated code\"\n");
str_addf(&HDR, "#error \"version mismatch between capnp_c.h and generated code\"\n");
str_addf(&HDR, "#endif\n\n");
for (j = 0; j < capn_len(file_req.imports); j++) {

4
compiler/schema.capnp.h
View file

@ -1,10 +1,10 @@
#ifndef CAPN_A93FC509624C72D9
#define CAPN_A93FC509624C72D9
/* AUTO GENERATED - DO NOT EDIT */
#include <capn.h>
#include <capnp_c.h>
#if CAPN_VERSION != 1
#error "version mismatch between capn.h and generated code"
#error "version mismatch between capnp_c.h and generated code"
#endif
#include "c++.capnp.h"

2
compiler/str.h
View file

@ -7,7 +7,7 @@
* of the MIT license. See the LICENSE file for details.
*/
#include <capn.h>
#include <capnp_c.h>
#include <stdlib.h>
struct str {

4
compiler/test.capnp.h
View file

@ -1,10 +1,10 @@
#ifndef CAPN_D508EEBDC2DC42B8
#define CAPN_D508EEBDC2DC42B8
/* AUTO GENERATED - DO NOT EDIT */
#include <capn.h>
#include <capnp_c.h>
#if CAPN_VERSION != 1
#error "version mismatch between capn.h and generated code"
#error "version mismatch between capnp_c.h and generated code"
#endif
#include "c++.capnp.h"

2
configure.ac
View file

@ -1,7 +1,7 @@
AC_PREREQ(2.60)
AC_INIT(c-capnproto, 0.1, [])
AC_CONFIG_SRCDIR(capn.h)
AC_CONFIG_SRCDIR(lib/capnp_c.h)
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([ac])

0
capn-list.inc → lib/capn-list.inc
View file

2
capn-malloc.c → lib/capn-malloc.c
View file

@ -8,7 +8,7 @@
* of the MIT license. See the LICENSE file for details.
*/
#include "capn.h"
#include "capnp_c.h"
#include <stdlib.h>
#include <string.h>
#include <limits.h>

2
capn-stream.c → lib/capn-stream.c
View file

@ -7,7 +7,7 @@
* of the MIT license. See the LICENSE file for details.
*/
#include "capn.h"
#include "capnp_c.h"
#include <string.h>
#ifndef min

2
capn.c → lib/capn.c
View file

@ -7,7 +7,7 @@
* of the MIT license. See the LICENSE file for details.
*/
#include "capn.h"
#include "capnp_c.h"
#include <stdlib.h>
#include <string.h>

6
capn.h → lib/capnp_c.h
View file

@ -1,5 +1,5 @@
/* vim: set sw=8 ts=8 sts=8 noet: */
/* capn.h
/* capnp_c.h
*
* Copyright (C) 2013 James McKaskill
* Copyright (C) 2014 Steve Dee
@ -8,8 +8,8 @@
* of the MIT license. See the LICENSE file for details.
*/
#ifndef CAPN_H
#define CAPN_H
#ifndef CAPNP_C_H
#define CAPNP_C_H
#include <stdint.h>
#include <stdio.h>