misc cleanup

Makefile

@@ -21,9 +21,9 @@ OBJS   = $(patsubst %.cc,%.o,$(CODE))
 CXX    = g++
 
 CFLAGS = -Wall -ansi -pedantic
-#DFLAGS = -O3 -fomit-frame-pointer -DRELEASE_LEVEL=0 -DNO_CLEANUP
-DFLAGS = -g -DRELEASE_LEVEL=4 -DNO_CLEANUP
-#DFLAGS = -g -DRELEASE_LEVEL=2 -pg -DNO_CLEANUP
+#DFLAGS = -O3 -fomit-frame-pointer -DRELEASE_LEVEL=0
+DFLAGS = -g -DRELEASE_LEVEL=4
+#DFLAGS = -g -DRELEASE_LEVEL=2 -pg
 
 INCS   = -I/sw/include \
 	 -I/usr/include/gcc/darwin/3.3/c++ \

amount.cc

@@ -1,4 +1,4 @@
-#include "ledger.h"
+#include "amount.h"
 
 #include "gmp.h"
 

balance.cc

@@ -1,4 +1,4 @@
-#include "ledger.h"
+#include "balance.h"
 
 namespace ledger {
 

binary.cc

@@ -1,5 +1,4 @@
 #include "ledger.h"
-#include "debug.h"
 
 #include <vector>
 #include <fstream>

debug.cc

@@ -102,4 +102,4 @@ static struct init_streams {
 
 } // namespace ledger
 
-#endif DEBUG_ENABLED
+#endif // DEBUG_ENABLED

ledger.h

@@ -16,15 +16,17 @@
 #include <ctime>
 #include <iostream>
 
-#include "amount.h"
-#include "balance.h"
-
 #ifdef RELEASE_LEVEL
 #if RELEASE_LEVEL >= 2
 #include "debug.h"
+#elif RELEASE_LEVEL == 0
+#define NO_CLEANUP 1
 #endif
 #endif
 
+#include "amount.h"
+#include "balance.h"
+
 namespace ledger {
 
 // These flags persist with the object

valexpr.cc

@@ -1,7 +1,6 @@
 #include "valexpr.h"
 #include "error.h"
 #include "datetime.h"
-#include "debug.h"
 
 #include <vector>