summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2007-05-24 18:49:57 +0000
committerJohn Wiegley <johnw@newartisans.com>2008-04-13 03:39:07 -0400
commit7dd3d2a44abf5860e17c1919ed059a16fd853221 (patch)
treedf102d70755341942680a5f2fda546054100c71d
parent84ead9153fe5d681276957688c5bf565bdf5b445 (diff)
downloadfork-ledger-7dd3d2a44abf5860e17c1919ed059a16fd853221.tar.gz
fork-ledger-7dd3d2a44abf5860e17c1919ed059a16fd853221.tar.bz2
fork-ledger-7dd3d2a44abf5860e17c1919ed059a16fd853221.zip
Changes to make structure.
-rw-r--r--Makefile.am9
-rwxr-xr-xacprep21
2 files changed, 21 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index 3e6cc430..7223a49a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,15 +18,8 @@ lib_LTLIBRARIES = libledger.la
AM_YFLAGS = -d
AM_LFLAGS = -o $(LEX_OUTPUT_ROOT).c
-WARNFLAGS = -Wall #-pedantic-errors
-#WARNFLAGS += -Wextra -Wfloat-equal -Wno-endif-labels -Wcast-qual
-#WARNFLAGS += -Wcast-align -Wwrite-strings -Wconversion -Wconversion
-#WARNFLAGS += -Wshorten-64-to-32 -Wsign-compare -Weffc++ -Wsign-promo
-#WARNFLAGS += -Wmissing-field-initializers -Wstrict-null-sentinel
-#WARNFLAGS += -Wold-style-cast -Woverloaded-virtual
-
libledger_la_LDFLAGS = -release $(PACKAGE_VERSION)
-libledger_la_CPPFLAGS = $(WARNFLAGS) \
+libledger_la_CPPFLAGS = \
-I$(top_builddir)/gdtoa \
-I$(srcdir)/gdtoa \
-I$(srcdir)/src \
diff --git a/acprep b/acprep
index 80761626..513a2585 100755
--- a/acprep
+++ b/acprep
@@ -44,9 +44,27 @@ fi
# that is built again anyway by Xcode).
SWITCHES=""
CPPFLAGS="$INCDIRS"
+CXXFLAGS="-pipe"
LDFLAGS="$LIBDIRS"
LOCAL=false
+# Warning flags
+CXXFLAGS="$CXXFLAGS -Wall -Wextra -ansi"
+CXXFLAGS="$CXXFLAGS -Weffc++"
+CXXFLAGS="$CXXFLAGS -Wcast-align"
+CXXFLAGS="$CXXFLAGS -Wcast-qual"
+CXXFLAGS="$CXXFLAGS -Wconversion"
+CXXFLAGS="$CXXFLAGS -Wfloat-equal"
+CXXFLAGS="$CXXFLAGS -Wmissing-field-initializers"
+CXXFLAGS="$CXXFLAGS -Wno-endif-labels"
+CXXFLAGS="$CXXFLAGS -Wold-style-cast"
+CXXFLAGS="$CXXFLAGS -Woverloaded-virtual"
+CXXFLAGS="$CXXFLAGS -Wshorten-64-to-32"
+CXXFLAGS="$CXXFLAGS -Wsign-compare"
+CXXFLAGS="$CXXFLAGS -Wsign-promo"
+CXXFLAGS="$CXXFLAGS -Wstrict-null-sentinel"
+CXXFLAGS="$CXXFLAGS -Wwrite-strings"
+
while [ -n "$1" ]; do
case "$1" in
@@ -56,12 +74,13 @@ while [ -n "$1" ]; do
--debug)
SWITCHES="$SWITCHES --enable-debug"
+ #CPPFLAGS="$CPPFLAGS -D_GLIBCXX_DEBUG=1"
CXXFLAGS="$CXXFLAGS -g" ;;
--boost)
shift 1
SWITCHES="$SWITCHES --with-boost-suffix=$1"
- CPPFLAGS="$CPPFLAGS -D_GLIBCXX_DEBUG=1" ;;
+ ;;
--gcov)
CXXFLAGS="$CXXFLAGS -fprofile-arcs -ftest-coverage" ;;