From 83dd204239e4f9cfc51c632c49bd1f87f015c28f Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Sat, 12 Apr 2014 08:55:58 +1000 Subject: [PATCH] Fix various build and packaging issues --- configure.ac | 13 +++++++++++++ src/Makefile.am | 6 +++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index e5e8e844..51f2ed80 100644 --- a/configure.ac +++ b/configure.ac @@ -44,8 +44,21 @@ AC_CHECK_HEADERS(jansson.h) PTHREAD_LIBS="-lpthread" MATH_LIBS="-lm" +RT_LIBS="-lrt" AC_SUBST(PTHREAD_LIBS) AC_SUBST(MATH_LIBS) +AC_SUBST(RT_LIBS) AC_OUTPUT([Makefile] [src/Makefile]) + +echo +echo "Compilation............: make (or gmake)" +echo " CPPFLAGS.............: $CPPFLAGS" +echo " CFLAGS...............: $CFLAGS" +echo " LDFLAGS..............: $LDFLAGS" +echo " LDADD................: $PTHREAD_LIBS $MATH_LIBS $RT_LIBS" +echo +echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')" +echo " prefix...............: $prefix" +echo diff --git a/src/Makefile.am b/src/Makefile.am index c3791a1c..f9dd8ba3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,9 +1,9 @@ ACLOCAL_AMFLAGS = -I m4 lib_LTLIBRARIES = libckpool.la -libckpool_la_SOURCES = libckpool.c -libckpool_la_LIBADD = @MATH_LIBS@ @PTHREAD_LIBS@ @JANSSON_LIBS@ +libckpool_la_SOURCES = libckpool.c libckpool.h +libckpool_la_LIBADD = @PTHREAD_LIBS@ @MATH_LIBS@ @RT_LIBS@ @JANSSON_LIBS@ bin_PROGRAMS = ckpool -ckpool_SOURCES = ckpool.c +ckpool_SOURCES = ckpool.c ckpool.h ckpool_LDADD = libckpool.la