Changeset 1c48503 in git

Timestamp:

Nov 17, 2011, 5:19:01 PM (12 years ago)

Author:

Jan Engelhardt <jengelh@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

a522916a7e6a9455b8b3b069cf64a8a507a5247f

Parents:

46d30daa1b116f5f75b1150600d3f00e24b98f42

git-author:

Jan Engelhardt <jengelh@medozas.de>2011-11-17 17:19:01+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-24 20:43:32+01:00

Message:

build: resolve deprecated use of INCLUDES (factory/)

Makefile.am:5: "INCLUDES" is the old name for "AM_CPPFLAGS" (or "*_CPPFLAGS")

File:

• factory/Makefile.am (modified) (2 diffs)

factory/Makefile.am

@@ -3 +3 @@
 CXXTEMPLFLAGS      =  --no-exceptions ## -fno-implicit-templates
 
-INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} ${GMP_CFLAGS} ${NTL_CFLAGS}
+AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} ${GMP_CFLAGS} ${NTL_CFLAGS}
 
 lib_LTLIBRARIES = libfactory.la libfactory_g.la
@@ -98 +98 @@
 libfactory_g_la_SOURCES = $(SOURCES)
 
-libfactory_la_CPPFLAGS  = -DHAVE_CONFIG_H -DOM_NDEBUG -DNDEBUG
-libfactory_g_la_CPPFLAGS= -DHAVE_CONFIG_H 
+libfactory_la_CPPFLAGS  = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DOM_NDEBUG -DNDEBUG
+libfactory_g_la_CPPFLAGS= ${AM_CPPFLAGS} -DHAVE_CONFIG_H 
 
 nodist_libfactory_la_SOURCES = cplusplus.h factory.h factoryconf.h