Commit 95355e1b authored by Dominik Charousset's avatar Dominik Charousset

Merge pull request #4 from mephi42/master

Autotools build changes
parents 5bb04e19 2db41543
......@@ -53,9 +53,13 @@ libcppa_la_SOURCES = \
src/yielding_message_queue.cpp \
src/yield_interface.cpp
library_includedir = $(includedir)/cppa-0.1/cppa
if VERSIONED_INCLUDE_DIR
library_includedir = $(includedir)/cppa/$(PACKAGE_VERSION)/
else
library_includedir = $(includedir)/
endif
library_include_HEADERS = \
nobase_library_include_HEADERS = \
cppa/actor_behavior.hpp \
cppa/actor.hpp \
cppa/actor_proxy.hpp \
......@@ -192,7 +196,9 @@ library_include_HEADERS = \
cppa/util/wrapped.hpp
libcppa_la_CXXFLAGS = --std=c++0x -pedantic -Wall -Wextra
libcppa_la_LDFLAGS = -release 0.1 $(BOOST_CPPFLAGS)
libcppa_la_LDFLAGS = -release $(PACKAGE_VERSION) $(BOOST_CPPFLAGS)
SUBDIRS = . unit_testing
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libcppa.pc
SUBDIRS = . unit_testing
AC_PREREQ([2.6])
AC_INIT([hamcast], [0.4])
AC_INIT([libcppa], [0.1])
AM_INIT_AUTOMAKE(@PACKAGE_NAME@, @PACKAGE_VERSION@)
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([src])
......@@ -39,5 +39,9 @@ AS_IF(
CPPFLAGS="$ORIGINAL_CPPFLAGS"
AC_CONFIG_FILES([Makefile unit_testing/Makefile])
# environment
AC_ARG_VAR([NO_VERSIONED_INCLUDE_DIR], [set this to 1 in order to install headers into <prefix>/cppa/ rather than into <prefix>/cppa/<version>/cppa/])
AM_CONDITIONAL([VERSIONED_INCLUDE_DIR], [test "x$NO_VERSIONED_INCLUDE_DIR" != "x1"])
AC_CONFIG_FILES([Makefile unit_testing/Makefile libcppa.pc])
AC_OUTPUT
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: libcppa
Description: C++ actors library.
#Requires:
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lcppa
Cflags: -I${includedir}/cppa/@PACKAGE_VERSION@
......@@ -20,7 +20,7 @@ unit_tests_SOURCES = hash_of.cpp \
test__type_list.cpp \
test__uniform_type.cpp
unit_tests_DEPENDENCIES = ../.libs/libcppa.dylib
unit_tests_DEPENDENCIES = ../.libs/libcppa.la
AM_CPPFLAGS = -I../
unit_tests_CXXFLAGS = --std=c++0x -pedantic -Wall -Wextra
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment