diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-12-18 12:39:51 +0200 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-12-18 12:39:51 +0200 |
| commit | a0b07275561bb40167e1359f9d32a07e67d31b77 (patch) | |
| tree | 62492889d31c5afc23d9a49d983d1082596f518d | |
| parent | b39efd37a7fbf478072c72f82b4310c8620a4cea (diff) | |
| download | gint-a0b07275561bb40167e1359f9d32a07e67d31b77.tar.gz gint-a0b07275561bb40167e1359f9d32a07e67d31b77.tar.bz2 | |
Use AM_CPPFLAGS instead of INCLUDES
| -rw-r--r-- | README | 10 | ||||
| -rw-r--r-- | gint.mk | 6 |
2 files changed, 8 insertions, 8 deletions
@@ -9,7 +9,7 @@ See end of file for copyright statement. GINT ==== Sergey Poznyakoff <gray@gnu.org> -2, May 11, 2010 +3, Dec 18, 2013 NAME ---- @@ -146,7 +146,7 @@ include ../gint/gint.mk The rules in `gint.mk` make certain assumptions about some `Makefile` variables. Namely, the following variables must be defined before -including the file: +INCLUDES+, +EXTRA_DIST+, +CLEANFILES+, +including the file: +AM_CPPFLAGS+, +EXTRA_DIST+, +CLEANFILES+, +DISTCLEANFILES+ (or +MAINTAINERCLEANFILES+, if +doc-distrib+ option is used), +SUFFIXES+, +BUILT_SOURCES+. See the http://sources.redhat.com/automake/automake.html[`Automake` documentation], @@ -185,7 +185,7 @@ using http://www.gnu.org/software/make/manual/html_node/Substitution-Refs.html[+ lib_LTLIBRARIES = libproj.la libproj_la_SOURCES = iface.c var.c -INCLUDES =-I$(top_builddir) -I$(srcdir) +AM_CPPFLAGS =-I$(top_builddir) -I$(srcdir) EXTRA_DIST= DOT_X_FILES=$(libproj_la_SOURCES:.c=.x) DOT_DOC_FILES=$(libproj_la_SOURCES:.c=.doc) @@ -495,7 +495,7 @@ and/or +GINT_LDADD+ in the `ACTION-IF-FOUND` argument to +GINT_INIT+: GINT_INCLUDES:: Specifies additional command line options to be appended to the - +INCLUDES+ statement in +gint/Makefile.am+. + +AM_CPPFLAGS+ statement in +gint/Makefile.am+. GINT_LDADD:: Specifies additional command line options to be appended to the +LDADD+ statement in +gint/Makefile.am+. @@ -570,7 +570,7 @@ snarf-doc-filter <8> COPYRIGHT --------- [verse] -Copyright (C) 2010 http://gray.gnu.org.ua[Sergey Poznyakoff] +Copyright (C) 2010, 2013 http://gray.gnu.org.ua[Sergey Poznyakoff] License GPLv3+: GNU GPL version 3 or later http://gnu.org/licenses/gpl.html[<http://gnu.org/licenses/gpl.html>]. This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. @@ -1,5 +1,5 @@ # This file is part of Gint -# Copyright (C) 2010 Sergey Poznyakoff +# Copyright (C) 2010, 2013 Sergey Poznyakoff # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. if GINT_COND_GUILE_OK -INCLUDES += @GUILE_INCLUDES@ +AM_CPPFLAGS += @GUILE_INCLUDES@ if GINT_COND_DOC_DISTRIB EXTRA_DIST += $(DOT_X_FILES) @@ -87,6 +87,6 @@ CLEANFILES += *.inc endif ## Add -MG to make the .x magic work with auto-dep code. -MKDEP = $(CC) -M -MG $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +MKDEP = $(CC) -M -MG $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) endif |