Skip to content

Commit

Permalink
Merge pull request #342 from riboseinc/v1.0.2
Browse files Browse the repository at this point in the history
V1.0.2
  • Loading branch information
jjr840430 authored Jan 30, 2018
2 parents 1a1699e + f6e2130 commit c22d69d
Show file tree
Hide file tree
Showing 9 changed files with 224 additions and 187 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dist: trusty
sudo: false
sudo: required
language: c

branches:
Expand Down
9 changes: 1 addition & 8 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,5 @@ if RTR_RPC
SUBDIRS+= rpc
endif

retrace: retrace.in
@sed -e "s|\@libdir\@|$(libdir)|" retrace.in > $@
chmod +x $@

dist_bin_SCRIPTS= retrace
pkgdata_DATA= retrace.conf.example

EXTRA_DIST= retrace.in autogen.sh retrace.conf.example
CLEANFILES = $(dist_bin_SCRIPTS)
EXTRA_DIST= autogen.sh retrace.conf.example
4 changes: 2 additions & 2 deletions ci/main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ function checkpatch() {
sh autogen.sh && \
./configure \
--disable-silent-rules \
--enable-tests \
--with-cmocka=${CMOCKA_INSTALL} \
--enable-rpc && \
--enable-tests && \
make clean && \
make

sudo make install
make check

# checkpatch
Expand Down
71 changes: 0 additions & 71 deletions retrace.in

This file was deleted.

Loading

0 comments on commit c22d69d

Please sign in to comment.