diff --git a/.travis.yml b/.travis.yml index 42bad2f..eef8bf9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,10 @@ language: c compiler: - gcc -before_install: sudo apt-get install check splint -install: - # Deal with issue on Travis builders - # https://github.com/travis-ci/travis-cookbooks/issues/155 - - "sudo rm -rf /dev/shm && sudo ln -s /run/shm /dev/shm" +addons: + apt: + packages: + - check + - splint script: ./autogen.sh && ./configure && make check && make distcheck -notifications: - email: - recipients: - - quarterback-devel@lists.fedorahosted.org +sudo: false diff --git a/lib/Makefile.am b/lib/Makefile.am index 37b9c23..c153d7e 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,86 +1,86 @@ # # Copyright (C) 2010 Red Hat, Inc. # # Author: Angus Salkeld # # This file is part of libqb. # # libqb is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by # the Free Software Foundation, either version 2.1 of the License, or # (at your option) any later version. # # libqb is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License # along with libqb. If not, see . MAINTAINERCLEANFILES = Makefile.in noinst_HEADERS = ipc_int.h util_int.h ringbuffer_int.h loop_int.h \ log_int.h map_int.h rpl_sem.h loop_poll_int.h \ atomic_int.h AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include lib_LTLIBRARIES = libqb.la -libqb_la_LDFLAGS = -version-number 0:17:1 +libqb_la_LDFLAGS = -version-info 17:2:17 source_to_lint = util.c hdb.c ringbuffer.c ringbuffer_helper.c \ array.c loop.c loop_poll.c loop_job.c \ loop_timerlist.c ipcc.c ipcs.c ipc_shm.c \ ipc_setup.c ipc_socket.c \ log.c log_thread.c log_blackbox.c log_file.c \ log_syslog.c log_dcs.c log_format.c \ map.c skiplist.c hashtable.c trie.c libqb_la_SOURCES = $(source_to_lint) unix.c libqb_la_LIBADD = @LTLIBOBJS@ AM_LDFLAGS = $(LDFLAGS_COPY:-Bsymbolic-functions=) if HAVE_SEM_TIMEDWAIT else libqb_la_SOURCES+=rpl_sem.c endif if HAVE_EPOLL libqb_la_SOURCES+=loop_poll_epoll.c else if HAVE_KQUEUE libqb_la_SOURCES+=loop_poll_kqueue.c else libqb_la_SOURCES+=loop_poll_poll.c endif endif pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libqb.pc if HAVE_SPLINT check_SCRIPTS = run_splint.sh TESTS = $(check_SCRIPTS) # this is a hack because debian/ubuntu don't set the arch path # in splint. DEB_INCLUDES = -I/usr/include/x86_64-linux-gnu -I/usr/include/i386-linux-gnu ALL_LINT_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DEB_INCLUDES) \ $(libqb_la_CPPFLAGS) $(CPPFLAGS) $(AM_CPPFLAGS) \ $(LINT_FLAGS) run_splint.sh: $(top_srcdir)/configure.ac echo "$(SPLINT) $(ALL_LINT_FLAGS) $(addprefix $(top_srcdir)/lib/, $(source_to_lint))" > $@ $(AM_V_GEN)chmod +x $@ dist-clean-local: $(AM_V_GEN)rm -f run_splint.sh clean-generic: $(AM_V_GEN)rm -f run_splint.sh endif