aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README10
-rw-r--r--gint.mk6
2 files changed, 8 insertions, 8 deletions
diff --git a/README b/README
index 5975884..ba1f635 100644
--- a/README
+++ b/README
@@ -9,7 +9,7 @@ See end of file for copyright statement.
9GINT 9GINT
10==== 10====
11Sergey Poznyakoff <gray@gnu.org> 11Sergey Poznyakoff <gray@gnu.org>
122, May 11, 2010 123, Dec 18, 2013
13 13
14NAME 14NAME
15---- 15----
@@ -146,7 +146,7 @@ include ../gint/gint.mk
146 146
147The rules in `gint.mk` make certain assumptions about some `Makefile` 147The rules in `gint.mk` make certain assumptions about some `Makefile`
148variables. Namely, the following variables must be defined before 148variables. Namely, the following variables must be defined before
149including the file: +INCLUDES+, +EXTRA_DIST+, +CLEANFILES+, 149including the file: +AM_CPPFLAGS+, +EXTRA_DIST+, +CLEANFILES+,
150+DISTCLEANFILES+ (or +MAINTAINERCLEANFILES+, if +doc-distrib+ 150+DISTCLEANFILES+ (or +MAINTAINERCLEANFILES+, if +doc-distrib+
151option is used), +SUFFIXES+, +BUILT_SOURCES+. See the 151option is used), +SUFFIXES+, +BUILT_SOURCES+. See the
152http://sources.redhat.com/automake/automake.html[`Automake` documentation], 152http://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[+
185lib_LTLIBRARIES = libproj.la 185lib_LTLIBRARIES = libproj.la
186libproj_la_SOURCES = iface.c var.c 186libproj_la_SOURCES = iface.c var.c
187 187
188INCLUDES =-I$(top_builddir) -I$(srcdir) 188AM_CPPFLAGS =-I$(top_builddir) -I$(srcdir)
189EXTRA_DIST= 189EXTRA_DIST=
190DOT_X_FILES=$(libproj_la_SOURCES:.c=.x) 190DOT_X_FILES=$(libproj_la_SOURCES:.c=.x)
191DOT_DOC_FILES=$(libproj_la_SOURCES:.c=.doc) 191DOT_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
496GINT_INCLUDES:: 496GINT_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+.
499GINT_LDADD:: 499GINT_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>
570COPYRIGHT 570COPYRIGHT
571--------- 571---------
572[verse] 572[verse]
573Copyright (C) 2010 http://gray.gnu.org.ua[Sergey Poznyakoff] 573Copyright (C) 2010, 2013 http://gray.gnu.org.ua[Sergey Poznyakoff]
574License GPLv3+: GNU GPL version 3 or later http://gnu.org/licenses/gpl.html[<http://gnu.org/licenses/gpl.html>]. 574License GPLv3+: GNU GPL version 3 or later http://gnu.org/licenses/gpl.html[<http://gnu.org/licenses/gpl.html>].
575This is free software: you are free to change and redistribute it. 575This is free software: you are free to change and redistribute it.
576There is NO WARRANTY, to the extent permitted by law. 576There is NO WARRANTY, to the extent permitted by law.
diff --git a/gint.mk b/gint.mk
index b8d03f3..250121d 100644
--- a/gint.mk
+++ b/gint.mk
@@ -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
17if GINT_COND_GUILE_OK 17if GINT_COND_GUILE_OK
18INCLUDES += @GUILE_INCLUDES@ 18AM_CPPFLAGS += @GUILE_INCLUDES@
19 19
20if GINT_COND_DOC_DISTRIB 20if GINT_COND_DOC_DISTRIB
21 EXTRA_DIST += $(DOT_X_FILES) 21 EXTRA_DIST += $(DOT_X_FILES)
@@ -87,6 +87,6 @@ CLEANFILES += *.inc
87endif 87endif
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.
90MKDEP = $(CC) -M -MG $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) 90MKDEP = $(CC) -M -MG $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)
91endif 91endif
92 92

Return to:

Send suggestions and report system problems to the System administrator.