diff options
-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. | |||
9 | GINT | 9 | GINT |
10 | ==== | 10 | ==== |
11 | Sergey Poznyakoff <gray@gnu.org> | 11 | Sergey Poznyakoff <gray@gnu.org> |
12 | 2, May 11, 2010 | 12 | 3, Dec 18, 2013 |
13 | 13 | ||
14 | NAME | 14 | NAME |
15 | ---- | 15 | ---- |
@@ -146,7 +146,7 @@ include ../gint/gint.mk | |||
146 | 146 | ||
147 | The rules in `gint.mk` make certain assumptions about some `Makefile` | 147 | The rules in `gint.mk` make certain assumptions about some `Makefile` |
148 | variables. Namely, the following variables must be defined before | 148 | variables. Namely, the following variables must be defined before |
149 | including the file: +INCLUDES+, +EXTRA_DIST+, +CLEANFILES+, | 149 | including the file: +AM_CPPFLAGS+, +EXTRA_DIST+, +CLEANFILES+, |
150 | +DISTCLEANFILES+ (or +MAINTAINERCLEANFILES+, if +doc-distrib+ | 150 | +DISTCLEANFILES+ (or +MAINTAINERCLEANFILES+, if +doc-distrib+ |
151 | option is used), +SUFFIXES+, +BUILT_SOURCES+. See the | 151 | option is used), +SUFFIXES+, +BUILT_SOURCES+. See the |
152 | http://sources.redhat.com/automake/automake.html[`Automake` documentation], | 152 | 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[+ | |||
185 | lib_LTLIBRARIES = libproj.la | 185 | lib_LTLIBRARIES = libproj.la |
186 | libproj_la_SOURCES = iface.c var.c | 186 | libproj_la_SOURCES = iface.c var.c |
187 | 187 | ||
188 | INCLUDES =-I$(top_builddir) -I$(srcdir) | 188 | AM_CPPFLAGS =-I$(top_builddir) -I$(srcdir) |
189 | EXTRA_DIST= | 189 | EXTRA_DIST= |
190 | DOT_X_FILES=$(libproj_la_SOURCES:.c=.x) | 190 | DOT_X_FILES=$(libproj_la_SOURCES:.c=.x) |
191 | DOT_DOC_FILES=$(libproj_la_SOURCES:.c=.doc) | 191 | 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+: | |||
495 | 495 | ||
496 | GINT_INCLUDES:: | 496 | GINT_INCLUDES:: |
497 | Specifies additional command line options to be appended to the | 497 | Specifies additional command line options to be appended to the |
498 | +INCLUDES+ statement in +gint/Makefile.am+. | 498 | +AM_CPPFLAGS+ statement in +gint/Makefile.am+. |
499 | GINT_LDADD:: | 499 | GINT_LDADD:: |
500 | Specifies additional command line options to be appended to the | 500 | Specifies additional command line options to be appended to the |
501 | +LDADD+ statement in +gint/Makefile.am+. | 501 | +LDADD+ statement in +gint/Makefile.am+. |
@@ -570,7 +570,7 @@ snarf-doc-filter <8> | |||
570 | COPYRIGHT | 570 | COPYRIGHT |
571 | --------- | 571 | --------- |
572 | [verse] | 572 | [verse] |
573 | Copyright (C) 2010 http://gray.gnu.org.ua[Sergey Poznyakoff] | 573 | Copyright (C) 2010, 2013 http://gray.gnu.org.ua[Sergey Poznyakoff] |
574 | License GPLv3+: GNU GPL version 3 or later http://gnu.org/licenses/gpl.html[<http://gnu.org/licenses/gpl.html>]. | 574 | License GPLv3+: GNU GPL version 3 or later http://gnu.org/licenses/gpl.html[<http://gnu.org/licenses/gpl.html>]. |
575 | This is free software: you are free to change and redistribute it. | 575 | This is free software: you are free to change and redistribute it. |
576 | There is NO WARRANTY, to the extent permitted by law. | 576 | There is NO WARRANTY, to the extent permitted by law. |
@@ -1,5 +1,5 @@ | |||
1 | # This file is part of Gint | 1 | # This file is part of Gint |
2 | # Copyright (C) 2010 Sergey Poznyakoff | 2 | # Copyright (C) 2010, 2013 Sergey Poznyakoff |
3 | # | 3 | # |
4 | # This program is free software; you can redistribute it and/or modify | 4 | # This program is free software; you can redistribute it and/or modify |
5 | # it under the terms of the GNU General Public License as published by | 5 | # it under the terms of the GNU General Public License as published by |
@@ -15,7 +15,7 @@ | |||
15 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | ||
17 | if GINT_COND_GUILE_OK | 17 | if GINT_COND_GUILE_OK |
18 | INCLUDES += @GUILE_INCLUDES@ | 18 | AM_CPPFLAGS += @GUILE_INCLUDES@ |
19 | 19 | ||
20 | if GINT_COND_DOC_DISTRIB | 20 | if GINT_COND_DOC_DISTRIB |
21 | EXTRA_DIST += $(DOT_X_FILES) | 21 | EXTRA_DIST += $(DOT_X_FILES) |
@@ -87,6 +87,6 @@ CLEANFILES += *.inc | |||
87 | endif | 87 | endif |
88 | 88 | ||
89 | ## Add -MG to make the .x magic work with auto-dep code. | 89 | ## Add -MG to make the .x magic work with auto-dep code. |
90 | MKDEP = $(CC) -M -MG $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) | 90 | MKDEP = $(CC) -M -MG $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) |
91 | endif | 91 | endif |
92 | 92 | ||