Use AM_CXX* for c++ build variables

This commit is contained in:
Danny Robson 2011-07-05 21:37:11 +10:00
parent 1556b6aba6
commit 4fb7b8e30f

View File

@ -1,8 +1,8 @@
AUTOMAKE_OPTIONS = dist-bzip2 dist-xz foreign AUTOMAKE_OPTIONS = dist-bzip2 dist-xz foreign
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
AM_CXXFLAGS = $(BOOST_CFLAGS) $(BOOST_FILESYSTEM_CFLAGS) $(COMMON_CXXFLAGS) AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(COMMON_CXXFLAGS)
AM_LDFLAGS = $(BOOST_LIB) $(BOOST_FILESYSTEM_LIB) $(COMMON_LDFLAGS) AM_LDFLAGS = $(BOOST_LDFLAGS) $(BOOST_FILESYSTEM_LIB) $(COMMON_LDFLAGS)
SUBDIRS = test SUBDIRS = test
@ -63,4 +63,4 @@ SUFFIXES = .cpp .cpp.rl
lib_LTLIBRARIES = libutil.la lib_LTLIBRARIES = libutil.la
libutil_la_SOURCES = $(UTIL_INCLUDE) $(UTIL_FILES) libutil_la_SOURCES = $(UTIL_INCLUDE) $(UTIL_FILES)
libutil_la_CXXFLAGS = -fPIC $(COMMON_CXXFLAGS) libutil_la_CXXFLAGS = -fPIC $(AM_CXXFLAGS)