summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2008-11-18 01:01:54 +0100
committerSimon Josefsson <simon@josefsson.org>2008-11-18 01:01:54 +0100
commitbb519beccf395b83f9a2976d1836f2c0033aac14 (patch)
tree546a2491e8ead372bd768c495dbf14de96b849db
parent1552ecbd5f85dae4b6d497fcbf96539876d25ad5 (diff)
downloadgnutls-bb519beccf395b83f9a2976d1836f2c0033aac14.tar.gz
Fix WARN_CFLAGS uses.
-rw-r--r--doc/examples/Makefile.am3
-rw-r--r--lib/Makefile.am2
-rw-r--r--lib/openpgp/Makefile.am2
-rw-r--r--libextra/Makefile.am2
4 files changed, 4 insertions, 5 deletions
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 3ba158f8d3..004af4020f 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -19,8 +19,8 @@
# along with this file; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+AM_CFLAGS = $(WARN_CFLAGS)
AM_CPPFLAGS = \
- $(WARN_CFLAGS) \
-I$(top_srcdir)/lib/includes -I$(top_builddir)/lib/includes \
-I$(top_srcdir)/libextra/includes \
-I$(top_srcdir)/gl -I$(top_builddir)/gl
@@ -43,7 +43,6 @@ endif
if ENABLE_CXX
ex_cxx_SOURCES = ex-cxx.cpp
-ex_cxx_CPPFLAGS = -I$(top_srcdir)/lib/includes -I$(top_builddir)/lib/includes
ex_cxx_LDADD = $(CXX_LDADD)
noinst_PROGRAMS += ex-cxx
endif
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0c75c175ce..4be39b632c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -29,8 +29,8 @@ endif
localedir = $(datadir)/locale
+AM_CFLAGS = $(WARN_CFLAGS)
AM_CPPFLAGS = \
- $(WARN_CFLAGS) \
-DLOCALEDIR=\"$(localedir)\" \
-I$(srcdir)/gl \
-I$(builddir)/gl \
diff --git a/lib/openpgp/Makefile.am b/lib/openpgp/Makefile.am
index 501472e8f4..27f57e123f 100644
--- a/lib/openpgp/Makefile.am
+++ b/lib/openpgp/Makefile.am
@@ -20,8 +20,8 @@
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301, USA
+AM_CFLAGS = $(WARN_CFLAGS)
AM_CPPFLAGS = \
- $(WARN_CFLAGS) \
-I$(srcdir)/../gl \
-I$(builddir)/../gl \
-I$(srcdir)/../includes \
diff --git a/libextra/Makefile.am b/libextra/Makefile.am
index ce01bd9830..5a5c698bbc 100644
--- a/libextra/Makefile.am
+++ b/libextra/Makefile.am
@@ -22,8 +22,8 @@
ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I ../lib/m4
+AM_CFLAGS = $(WARN_CFLAGS)
AM_CPPFLAGS = \
- $(WARN_CFLAGS) \
-I$(srcdir)/../lib/gl \
-I$(builddir)/../lib/gl \
-I$(srcdir)/gl \