Removed filesystem dependency to libcsptr and link to the static library

This commit is contained in:
Snaipe 2015-04-14 17:14:42 +02:00
parent 4d42af0fcb
commit 8bec0a7230
2 changed files with 5 additions and 5 deletions

View file

@ -1,6 +1,6 @@
ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS = -DLOCALEDIR='"$(localedir)"'
SUBDIRS = po dependencies/csptr samples
SUBDIRS = po samples
lib_LTLIBRARIES = libcriterion.la
@ -12,11 +12,9 @@ libcriterion_la_CFLAGS = \
-std=gnu11 \
-I$(top_srcdir)/src/ \
-I$(top_srcdir)/include/ \
-I$(top_srcdir)/dependencies/csptr/include/ \
$(COVERAGE_CFLAGS)
libcriterion_la_LDFLAGS = $(COVERAGE_LDFLAGS)
libcriterion_la_LIBADD = -lcsptr
EXTRA_DIST = config.rpath LICENSE

View file

@ -20,6 +20,10 @@ AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_SUBST([LIBTOOL_DEPS])
AC_CHECK_LIB([csptr], [smalloc], [], [AC_MSG_ERROR([Could not find libcsptr dependency. \
Please go to https://github.com/Snaipe/c-smart-pointers.git \
and follow the installation instructions.])])
AC_FUNC_FNMATCH
enable_rt_tests="no"
@ -43,6 +47,4 @@ AC_ARG_ENABLE([gcov],
AC_CONFIG_HEADERS([src/config.h])
AC_CONFIG_FILES([Makefile samples/Makefile po/Makefile.in])
AC_CONFIG_SUBDIRS([dependencies/csptr])
AC_OUTPUT