Skip to content

Commit 986bcf5

Browse files
implimpl
committed
Restructure include directories.
It's now very easy for users to include support for libcurvecpr in their programs: #include <curvecpr.h> Support for the GLib-based implementations is also easy to add: #include <curvecpr_glib.h>
1 parent 214c8df commit 986bcf5

34 files changed

Lines changed: 84 additions & 81 deletions

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ AC_PREREQ(2.67)
22
AC_INIT(libcurvecpr, 0.1.0, nfontes+libcurvecpr@cynigram.com, libcurvecpr)
33
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
44

5-
AC_CONFIG_SRCDIR([libcurvecpr/include/server.h])
5+
AC_CONFIG_SRCDIR([libcurvecpr/include/curvecpr.h])
66
AC_CONFIG_HEADER([config.h])
77
AC_CONFIG_MACRO_DIR([m4])
88

‎libcurvecpr-glib/include/Makefile.am‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
curvecprglibincludedir = $(includedir)/curvecpr/glib
2-
curvecprglibinclude_HEADERS = \
3-
client_messager_glib.h \
4-
curvecpr_glib.h \
5-
messager_glib.h
1+
nobase_include_HEADERS = \
2+
curvecpr_glib/client_messager_glib.h \
3+
curvecpr_glib/messager_glib.h \
4+
curvecpr_glib.h

‎libcurvecpr-glib/include/curvecpr_glib.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef __CURVECPR_GLIB_CURVECPR_GLIB_H
22
#define __CURVECPR_GLIB_CURVECPR_GLIB_H
33

4-
#include "client_messager_glib.h"
5-
#include "messager_glib.h"
4+
#include <curvecpr_glib/client_messager_glib.h>
5+
#include <curvecpr_glib/messager_glib.h>
66

77
#endif

libcurvecpr-glib/include/client_messager_glib.h renamed to libcurvecpr-glib/include/curvecpr_glib/client_messager_glib.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#ifndef __CURVECPR_GLIB_CLIENT_MESSAGER_GLIB_H
22
#define __CURVECPR_GLIB_CLIENT_MESSAGER_GLIB_H
33

4-
#include "block.h"
5-
#include "client.h"
64
#include "messager_glib.h"
75

6+
#include <curvecpr/block.h>
7+
#include <curvecpr/client.h>
8+
89
#include <string.h>
910

1011
#include <sodium/crypto_uint64.h>

libcurvecpr-glib/include/messager_glib.h renamed to libcurvecpr-glib/include/curvecpr_glib/messager_glib.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#ifndef __CURVECPR_GLIB_MESSAGER_GLIB_H
22
#define __CURVECPR_GLIB_MESSAGER_GLIB_H
33

4-
#include "block.h"
5-
#include "messager.h"
4+
#include <curvecpr/block.h>
5+
#include <curvecpr/messager.h>
66

77
#include <string.h>
88

‎libcurvecpr-glib/lib/client_messager_glib.c‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
#include "config.h"
22

3-
#include "bytes.h"
4-
#include "client.h"
5-
#include "client_messager_glib.h"
6-
#include "messager_glib.h"
3+
#include <curvecpr_glib/client_messager_glib.h>
4+
5+
#include <curvecpr_glib/messager_glib.h>
6+
7+
#include <curvecpr/bytes.h>
8+
#include <curvecpr/client.h>
79

810
static int _client_send (struct curvecpr_client *client, const unsigned char *buf, size_t num)
911
{

‎libcurvecpr-glib/lib/messager_glib.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#include "config.h"
22

3-
#include "bytes.h"
4-
#include "messager.h"
5-
#include "messager_glib.h"
3+
#include <curvecpr_glib/messager_glib.h>
4+
5+
#include <curvecpr/bytes.h>
6+
#include <curvecpr/messager.h>
67

78
#include <errno.h>
89
#include <string.h>

‎libcurvecpr-glib/libcurvecpr-glib.pc.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ URL: https://github.com/impl/libcurvecpr
1111
Requires: libcurvecpr = @PACKAGE_VERSION@
1212
Requires.private: glib-2.0 >= 2.14.0
1313
Libs: -L${libdir} -lcurvecpr-glib
14-
Cflags: -I${includedir}/curvecpr/glib
14+
Cflags: -I${includedir}

‎libcurvecpr/include/Makefile.am‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
curvecprincludedir = $(includedir)/curvecpr
2-
curvecprinclude_HEADERS = \
3-
block.h \
4-
bytes.h \
5-
chicago.h \
6-
client.h \
7-
curvecpr.h \
8-
messager.h \
9-
packet.h \
10-
server.h \
11-
session.h \
12-
util.h
1+
nobase_include_HEADERS = \
2+
curvecpr/block.h \
3+
curvecpr/bytes.h \
4+
curvecpr/chicago.h \
5+
curvecpr/client.h \
6+
curvecpr/messager.h \
7+
curvecpr/packet.h \
8+
curvecpr/server.h \
9+
curvecpr/session.h \
10+
curvecpr/util.h \
11+
curvecpr.h

‎libcurvecpr/include/curvecpr.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#ifndef __CURVECPR_CURVECPR_H
22
#define __CURVECPR_CURVECPR_H
33

4-
#include "block.h"
5-
#include "bytes.h"
6-
#include "chicago.h"
7-
#include "client.h"
8-
#include "messager.h"
9-
#include "packet.h"
10-
#include "server.h"
11-
#include "session.h"
12-
#include "util.h"
4+
#include <curvecpr/block.h>
5+
#include <curvecpr/bytes.h>
6+
#include <curvecpr/chicago.h>
7+
#include <curvecpr/client.h>
8+
#include <curvecpr/messager.h>
9+
#include <curvecpr/packet.h>
10+
#include <curvecpr/server.h>
11+
#include <curvecpr/session.h>
12+
#include <curvecpr/util.h>
1313

1414
#endif

0 commit comments

Comments
 (0)