Skip to content

Commit

Permalink
build: update build system
Browse files Browse the repository at this point in the history
Minor fixes to the build-system all over the place.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
  • Loading branch information
David Herrmann committed Aug 2, 2018
1 parent 24e301e commit 8f1fdb7
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 207 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
os: linux
dist: trusty
language: c

services:
- docker

Expand Down
201 changes: 0 additions & 201 deletions LICENSE

This file was deleted.

1 change: 1 addition & 0 deletions LICENSE
4 changes: 2 additions & 2 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ REQUIREMENTS:
pkg-config >= 0.29

INSTALL:
The meson build-system is used for c-siphash. Contact upstream
The meson build-system is used for this project. Contact upstream
documentation for detailed help. In most situations the following
commands are sufficient to build and install c-siphash from source:
commands are sufficient to build and install from source:

$ mkdir build
$ cd build
Expand Down
3 changes: 2 additions & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ project(
license: 'Apache',
default_options: [
'c_std=c11'
]
],
)
project_description = 'Streaming-capable SipHash Implementation'

add_project_arguments('-D_GNU_SOURCE', language: 'c')
mod_pkgconfig = import('pkgconfig')
Expand Down
6 changes: 3 additions & 3 deletions src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ libcsiphash_shared = shared_library(
libcsiphash_dep = declare_dependency(
include_directories: include_directories('.'),
link_with: libcsiphash_private,
version: meson.project_version()
version: meson.project_version(),
)

if not meson.is_subproject()
Expand All @@ -42,7 +42,7 @@ if not meson.is_subproject()
version: meson.project_version(),
name: 'libcsiphash',
filebase: 'libcsiphash',
description: 'Streaming-capable SipHash Implementation',
description: project_description,
)
endif

Expand All @@ -53,5 +53,5 @@ endif
test_api = executable('test-api', ['test-api.c'], link_with: libcsiphash_shared)
test('API Symbol Visibility', test_api)

test_basic = executable('test-basic', ['test-basic.c'], link_with: libcsiphash_private)
test_basic = executable('test-basic', ['test-basic.c'], dependencies: libcsiphash_dep)
test('Basic API Behavior', test_basic)

0 comments on commit 8f1fdb7

Please sign in to comment.