summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <gp@n-dimensional.de>2006-10-03 20:01:36 +0000
committerHans Ulrich Niedermann <gp@n-dimensional.de>2006-10-03 20:01:36 +0000
commitf254047b9a159af13bb6ce106f5e7b84891ef858 (patch)
tree9e83badafea98dd1ed2441ef7859bcc35a6e8072 /tests
parentba096f8acb6684e02fe4834b6b8456617c1af535 (diff)
downloadlibgphoto2-f254047b9a159af13bb6ce106f5e7b84891ef858.tar.gz
separate between CPPFLAGS, CFLAGS, CXXFLAGS and their AM_ equivalent
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@9258 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d77b25bb4..70df7b9e3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -46,15 +46,15 @@ test_camera_list_LDADD = \
$(INTLLIBS)
if HAVE_GCC
-PEDANTIC_CFLAGS = -std=c99 -pedantic -W -Wall -Wextra -Werror
-PEDANTIC_CXXFLAGS = -std=c++98 -pedantic -W -Wall -Wextra -Werror
+PEDANTIC_CFLAGS = -std=c99 -pedantic-errors -W -Wall -Wextra -Werror
+PEDANTIC_CXXFLAGS = -ansi -pedantic-errors -W -Wall -Wextra -Werror
else
PEDANTIC_CFLAGS =
PEDANTIC_CXXFLAGS =
endif
test_pedantic_c_SOURCES = test-pedantic-compilation.c
-test_pedantic_c_CPPFLAGS = $(PEDANTIC_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS)
+test_pedantic_c_CFLAGS = $(PEDANTIC_CFLAGS) $(AM_CFLAGS) $(CFLAGS)
test_pedantic_c_LDADD = \
$(top_builddir)/libgphoto2/libgphoto2.la \
$(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \
@@ -62,7 +62,7 @@ test_pedantic_c_LDADD = \
$(INTLLIBS)
test_pedantic_cxx_SOURCES = test-pedantic-compilation.cxx
-test_pedantic_cxx_CXXFLAGS = $(PEDANTIC_CXXFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS)
+test_pedantic_cxx_CXXFLAGS = $(PEDANTIC_CXXFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
test_pedantic_cxx_LDADD = \
$(top_builddir)/libgphoto2/libgphoto2.la \
$(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \