Skip to content

Commit

Permalink
Fix the distribution configuration to work properly
Browse files Browse the repository at this point in the history
include all the headers in the tarball (some are 'noinst')
put the jstruct headers in $(includedir)/jstruct/*
Add a note for the confusing libtool .so version info setting.
  • Loading branch information
jamie-pate committed Jan 2, 2016
1 parent c0f4092 commit 3baa690
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,6 @@ script:
- cat tests/test-suite.log
- tests/test_all.py
- LD_LIBRARY_PATH=jstruct/.libs/ CK_FORK="no" valgrind --leak-check=yes tests/.libs/check_jstruct
- make dist
- tar -zxf libjstruct-la-*.tar.gz
- cd $(find ./ -name 'libjstruct-la-*.*.*') && ./configure && make && sudo make install
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AC_INIT([libjstruct.la], [0.0.5], [[email protected]])
AC_INIT([libjstruct.la], [0.0.6], [[email protected]])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])

Expand Down
10 changes: 9 additions & 1 deletion jstruct/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
## Process this file with automake to produce Makefile.in

lib_LTLIBRARIES = libjstruct.la

libjstructincludedir = $(includedir)/jstruct
libjstruct_la_SOURCES = jstruct.c jstruct_private.c error.c export.c import.c
include_HEADERS = jstruct.h export.h import.h error.h result.h
# libtool -version-info c:r:a
# no interface change: bump revision only, don’t touch current nor age.
# interface change: set revision to 0, bump current and age.
# recompile/link change: Bump current, set revision and age to 0.
libjstruct_la_LDFLAGS = -version-info 0:0:0
libjstructinclude_HEADERS = jstruct.h export.h import.h error.h result.h
noinst_HEADERS = jstruct_private.h export_private.h import_private.h error.init.h result.init.h

0 comments on commit 3baa690

Please sign in to comment.