diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2020-02-18 23:39:24 +0100 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2020-02-18 23:39:24 +0100 |
| commit | 11a5bac5165038dbf4eb018843c71a96e472a9b9 (patch) | |
| tree | 30ec8e530889c1a1c8e55a632b181254e2b5af6f | |
| parent | aa7fe17d6b655e9ca34a66356fb7737ef5018c8c (diff) | |
| download | libgphoto2-11a5bac5165038dbf4eb018843c71a96e472a9b9.tar.gz | |
FIXMEUP: Remove -ansi cases from pendantic compile tests
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | tests/Makefile.am | 30 |
2 files changed, 9 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index 0830d4d08..5a3ffa6d6 100644 --- a/configure.ac +++ b/configure.ac @@ -99,11 +99,10 @@ dnl Determine the most pedantic compiler flags we can can find for both dnl C and C++, so that we can test that the libgphoto2 headers compile dnl with those flags. dnl -------------------------------------------------------------------- -GP_CHECK_PEDANTIC_COMPILER_FLAGS([ANSIC], [C], [-ansi]) +GP_CHECK_PEDANTIC_COMPILER_FLAGS([C90], [C], [-std=c90]) GP_CHECK_PEDANTIC_COMPILER_FLAGS([C99], [C], [-std=c99]) GP_CHECK_PEDANTIC_COMPILER_FLAGS([C11], [C], [-std=c11]) dnl -GP_CHECK_PEDANTIC_COMPILER_FLAGS([ANSICXX], [C++], [-ansi]) GP_CHECK_PEDANTIC_COMPILER_FLAGS([CXX98], [C++], [-std=c++98]) GP_CHECK_PEDANTIC_COMPILER_FLAGS([CXX11], [C++], [-std=c++11]) GP_CHECK_PEDANTIC_COMPILER_FLAGS([CXX14], [C++], [-std=c++14]) diff --git a/tests/Makefile.am b/tests/Makefile.am index e1da418e9..6c3d4449c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -151,14 +151,14 @@ generic_pedantic_cppflags = generic_pedantic_cppflags += -I$(top_srcdir)/libgphoto2_port generic_pedantic_cppflags += -I$(top_srcdir) -if GP_HAVE_PEDANTIC_FLAGS_ANSIC -TESTS += test-pedantic-ansic -check_PROGRAMS += test-pedantic-ansic -test_pedantic_ansic_SOURCES = test-pedantic-compilation.c -test_pedantic_ansic_CPPFLAGS = $(generic_pedantic_cppflags) -test_pedantic_ansic_CFLAGS = $(GP_PEDANTIC_CFLAGS_ANSIC) -test_pedantic_ansic_LDADD = -test_pedantic_ansic_LDFLAGS = +if GP_HAVE_PEDANTIC_FLAGS_C90 +TESTS += test-pedantic-c90 +check_PROGRAMS += test-pedantic-c90 +test_pedantic_c90_SOURCES = test-pedantic-compilation.c +test_pedantic_c90_CPPFLAGS = $(generic_pedantic_cppflags) +test_pedantic_c90_CFLAGS = $(GP_PEDANTIC_CFLAGS_C90) +test_pedantic_c90_LDADD = +test_pedantic_c90_LDFLAGS = endif if GP_HAVE_PEDANTIC_FLAGS_C99 @@ -181,20 +181,6 @@ test_pedantic_c11_LDADD = test_pedantic_c11_LDFLAGS = endif -if GP_HAVE_PEDANTIC_FLAGS_ANSICXX -if HAVE_CXX -TESTS += test-pedantic-ansicxx -check_PROGRAMS += test-pedantic-ansicxx -else -EXTRA_PROGRAMS += test-pedantic-ansicxx -endif -test_pedantic_ansicxx_SOURCES = test-pedantic-compilation.cxx -test_pedantic_ansicxx_CPPFLAGS = $(generic_pedantic_cppflags) -test_pedantic_ansicxx_CXXFLAGS = $(GP_PEDANTIC_CXXFLAGS_ANSICXX) -test_pedantic_ansicxx_LDADD = -test_pedantic_ansicxx_LDFLAGS = -endif - if GP_HAVE_PEDANTIC_FLAGS_CXX98 if HAVE_CXX TESTS += test-pedantic-cxx98 |