From 22685d657c483ab53c645bb9228bd5d4dd708cf5 Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Tue, 15 Jun 2010 22:05:46 +0000 Subject: [PATCH] fix last commit gcc options (-wunknown-pragmas ==> -Wno-unknown-pragmas) --- Makefile.am | 2 +- src/Makefile.am | 2 +- src/context/Makefile.am | 2 +- src/expr/Makefile.am | 2 +- src/main/Makefile.am | 2 +- src/parser/Makefile.am | 2 +- src/parser/cvc/Makefile.am | 2 +- src/parser/smt/Makefile.am | 2 +- src/parser/smt2/Makefile.am | 2 +- src/prop/Makefile.am | 2 +- src/prop/minisat/Makefile.am | 2 +- src/smt/Makefile.am | 2 +- src/theory/Makefile.am | 2 +- src/theory/arith/Makefile.am | 2 +- src/theory/arrays/Makefile.am | 2 +- src/theory/booleans/Makefile.am | 2 +- src/theory/bv/Makefile.am | 2 +- src/theory/uf/Makefile.am | 2 +- src/util/Makefile.am | 2 +- test/unit/Makefile.am | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Makefile.am b/Makefile.am index fbd66a536..4048b1b41 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/config/doxygen.am -AM_CXXFLAGS = -Wall -wunknown-pragmas +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I config diff --git a/src/Makefile.am b/src/Makefile.am index 98b05e23c..a805f8c85 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,7 +15,7 @@ LIBCVC4_VERSION = @CVC4_LIBRARY_VERSION@ AM_CPPFLAGS = -D__BUILDING_CVC4LIB \ -I@srcdir@/include -I@srcdir@ -AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN) +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) SUBDIRS = expr util context theory prop smt . parser main diff --git a/src/context/Makefile.am b/src/context/Makefile.am index 549cf54cf..3d912e685 100644 --- a/src/context/Makefile.am +++ b/src/context/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ -I@srcdir@/../include -I@srcdir@/.. -AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN) +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libcontext.la diff --git a/src/expr/Makefile.am b/src/expr/Makefile.am index fa1a1b082..2b5bdbdb3 100644 --- a/src/expr/Makefile.am +++ b/src/expr/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ -I@srcdir@/../include -I@srcdir@/.. -AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN) +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libexpr.la diff --git a/src/main/Makefile.am b/src/main/Makefile.am index 6d6adade2..9ffa43ca0 100644 --- a/src/main/Makefile.am +++ b/src/main/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -I@srcdir@/../include -I@srcdir@/.. $(ANTLR_INCLUDES) -AM_CXXFLAGS = -Wall -wunknown-pragmas +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas bin_PROGRAMS = cvc4 diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am index 87b0f9f9d..a323ec3cb 100644 --- a/src/parser/Makefile.am +++ b/src/parser/Makefile.am @@ -15,7 +15,7 @@ LIBCVC4PARSER_VERSION = @CVC4_PARSER_LIBRARY_VERSION@ AM_CPPFLAGS = \ -D__BUILDING_CVC4PARSERLIB \ -I@srcdir@/../include -I@srcdir@/.. $(ANTLR_INCLUDES) -AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN) +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) SUBDIRS = smt smt2 cvc diff --git a/src/parser/cvc/Makefile.am b/src/parser/cvc/Makefile.am index c08c6d694..9754c1063 100644 --- a/src/parser/cvc/Makefile.am +++ b/src/parser/cvc/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4PARSERLIB \ -I@srcdir@/../../include -I@srcdir@/../.. $(ANTLR_INCLUDES) -AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -Wno-unused-function -Wno-unused-variable +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -Wno-unused-function -Wno-unused-variable # Compile generated C files using C++ compiler CC=$(CXX) diff --git a/src/parser/smt/Makefile.am b/src/parser/smt/Makefile.am index a349273e0..418b204dc 100644 --- a/src/parser/smt/Makefile.am +++ b/src/parser/smt/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4PARSERLIB \ -I@srcdir@/../../include -I@srcdir@/../.. $(ANTLR_INCLUDES) -AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -Wno-unused-function -Wno-unused-variable +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -Wno-unused-function -Wno-unused-variable # Compile generated C files using C++ compiler AM_CFLAGS = $(AM_CXXFLAGS) diff --git a/src/parser/smt2/Makefile.am b/src/parser/smt2/Makefile.am index 97583c12b..3066f2247 100644 --- a/src/parser/smt2/Makefile.am +++ b/src/parser/smt2/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4PARSERLIB \ -I@srcdir@/../../include -I@srcdir@/../.. $(ANTLR_INCLUDES) -AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -Wno-unused-function -Wno-unused-variable +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -Wno-unused-function -Wno-unused-variable # Compile generated C files using C++ compiler AM_CFLAGS = $(AM_CXXFLAGS) diff --git a/src/prop/Makefile.am b/src/prop/Makefile.am index a441773e8..48c9c3fd2 100644 --- a/src/prop/Makefile.am +++ b/src/prop/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ -I@srcdir@/../include -I@srcdir@/.. -AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN) +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libprop.la diff --git a/src/prop/minisat/Makefile.am b/src/prop/minisat/Makefile.am index 829a705f5..77d1d602e 100644 --- a/src/prop/minisat/Makefile.am +++ b/src/prop/minisat/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ -I@srcdir@/mtl -I@srcdir@/core -I@srcdir@/../.. -I@srcdir@/../../include -AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -DNDEBUG +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -DNDEBUG noinst_LTLIBRARIES = libminisat.la libminisat_la_SOURCES = \ diff --git a/src/smt/Makefile.am b/src/smt/Makefile.am index 21140e86d..72dd8f3df 100644 --- a/src/smt/Makefile.am +++ b/src/smt/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ -I@srcdir@/../include -I@srcdir@/.. -AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN) +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libsmt.la diff --git a/src/theory/Makefile.am b/src/theory/Makefile.am index ca0ade6cd..7cfc1571b 100644 --- a/src/theory/Makefile.am +++ b/src/theory/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ -I@srcdir@/../include -I@srcdir@/.. -AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN) +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libtheory.la diff --git a/src/theory/arith/Makefile.am b/src/theory/arith/Makefile.am index 51b63acd3..83d44e285 100644 --- a/src/theory/arith/Makefile.am +++ b/src/theory/arith/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ -I@srcdir@/../../include -I@srcdir@/../.. -AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN) +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libarith.la diff --git a/src/theory/arrays/Makefile.am b/src/theory/arrays/Makefile.am index 34d29c237..84b9faaf4 100644 --- a/src/theory/arrays/Makefile.am +++ b/src/theory/arrays/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ -I@srcdir@/../../include -I@srcdir@/../.. -AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN) +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libarrays.la diff --git a/src/theory/booleans/Makefile.am b/src/theory/booleans/Makefile.am index 5de781b7f..478fca1cf 100644 --- a/src/theory/booleans/Makefile.am +++ b/src/theory/booleans/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ -I@srcdir@/../../include -I@srcdir@/../.. -AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN) +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libbooleans.la diff --git a/src/theory/bv/Makefile.am b/src/theory/bv/Makefile.am index cf1012e86..94941d406 100644 --- a/src/theory/bv/Makefile.am +++ b/src/theory/bv/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ -I@srcdir@/../../include -I@srcdir@/../.. -AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN) +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libbv.la diff --git a/src/theory/uf/Makefile.am b/src/theory/uf/Makefile.am index 2dadef309..39586345b 100644 --- a/src/theory/uf/Makefile.am +++ b/src/theory/uf/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ -I@srcdir@/../../include -I@srcdir@/../.. -AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN) +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libuf.la diff --git a/src/util/Makefile.am b/src/util/Makefile.am index b60d61e99..88d4fc56e 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ -I@srcdir@/../include -I@srcdir@/.. -AM_CXXFLAGS = -Wall -wunknown-pragmas $(FLAG_VISIBILITY_HIDDEN) +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libutil.la diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am index a5ba6b3a1..9f8379d54 100644 --- a/test/unit/Makefile.am +++ b/test/unit/Makefile.am @@ -45,7 +45,7 @@ if HAVE_CXXTESTGEN AM_CPPFLAGS = \ -I. "-I@CXXTEST@" "-I@top_srcdir@/src/include" "-I@top_srcdir@/src" \ $(ANTLR_INCLUDES) $(TEST_CPPFLAGS) -AM_CXXFLAGS = -Wall -wunknown-pragmas $(TEST_CXXFLAGS) +AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(TEST_CXXFLAGS) AM_LDFLAGS = $(TEST_LDFLAGS) AM_CXXFLAGS_WHITE = -fno-access-control -D__BUILDING_CVC4LIB_UNIT_TEST -D__BUILDING_CVC4PARSERLIB_UNIT_TEST -- 2.30.2