Got make distcheck working (yet again).

2 files changed, 84 insertions, 94 deletions

diff --git a/ledger.xcodeproj/johnw.mode1 b/ledger.xcodeproj/johnw.mode1
index 3c927b00..0c179deb 100644
--- a/ledger.xcodeproj/johnw.mode1
+++ b/ledger.xcodeproj/johnw.mode1
@@ -359,7 +359,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>datetime.cc</string>
+								<string>amount.cc</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -367,11 +367,11 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>datetime.cc</string>
+										<string>amount.cc</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>3357D0A80BD4A44C004B3223</string>
+										<string>3357D0BB0BD4A651004B3223</string>
 										<key>history</key>
 										<array>
 											<string>333230340B802B2C00C403F5</string>
@@ -381,7 +381,6 @@
 											<string>333230960B802C9A00C403F5</string>
 											<string>333230A30B802D4000C403F5</string>
 											<string>333230A40B802D4000C403F5</string>
-											<string>333230A60B802D4000C403F5</string>
 											<string>333230A70B802D4000C403F5</string>
 											<string>333230A80B802D4000C403F5</string>
 											<string>333230A90B802D4000C403F5</string>
@@ -394,7 +393,8 @@
 											<string>33B8460B0BD0A5CC00472F4E</string>
 											<string>33B846130BD0A63200472F4E</string>
 											<string>33B846400BD0A6EB00472F4E</string>
-											<string>333106140BD0A8DE00A43EF0</string>
+											<string>3357D0B80BD4A651004B3223</string>
+											<string>3357D0B90BD4A651004B3223</string>
 										</array>
 										<key>prevStack</key>
 										<array>
@@ -419,6 +419,7 @@
 											<string>333230C00B802D4000C403F5</string>
 											<string>333230C20B802D4000C403F5</string>
 											<string>33B8460D0BD0A5CC00472F4E</string>
+											<string>3357D0BA0BD4A651004B3223</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -597,7 +598,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>198485068.55365801</real>
+	<real>198485585.74654299</real>
 	<key>ToolbarDisplayMode</key>
 	<integer>1</integer>
 	<key>ToolbarIsVisible</key>
@@ -637,7 +638,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CD0528F0623707200166675</string>
 								<key>PBXProjectModuleLabel</key>
-								<string></string>
+								<string>amount.cc</string>
 								<key>StatusBarVisibility</key>
 								<true/>
 							</dict>
@@ -658,6 +659,8 @@
 							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
+								<key>PBXBuildLogShowsTranscriptDefaultKey</key>
+								<string>{{0, 93}, {730, 143}}</string>
 								<key>PBXProjectModuleGUID</key>
 								<string>XCMainBuildResultsModuleGUID</string>
 								<key>PBXProjectModuleLabel</key>
diff --git a/ledger.xcodeproj/johnw.pbxuser b/ledger.xcodeproj/johnw.pbxuser
index fc793551..d3c3754b 100644
--- a/ledger.xcodeproj/johnw.pbxuser
+++ b/ledger.xcodeproj/johnw.pbxuser
@@ -100,66 +100,55 @@
 			PBXWorkspaceStateSaveDate = 198484953;
 		};
 		perUserProjectItems = {
-			333106140BD0A8DE00A43EF0 = 333106140BD0A8DE00A43EF0 /* PBXTextBookmark */;
-			333230340B802B2C00C403F5 = 333230340B802B2C00C403F5 /* PBXTextBookmark */;
-			333230360B802B2C00C403F5 = 333230360B802B2C00C403F5 /* PBXTextBookmark */;
-			333230700B802C1B00C403F5 = 333230700B802C1B00C403F5 /* PBXTextBookmark */;
-			333230740B802C2700C403F5 = 333230740B802C2700C403F5 /* PBXTextBookmark */;
-			333230760B802C3300C403F5 = 333230760B802C3300C403F5 /* PBXTextBookmark */;
-			333230780B802C3300C403F5 = 333230780B802C3300C403F5 /* PBXTextBookmark */;
-			3332307B0B802C4100C403F5 = 3332307B0B802C4100C403F5 /* PBXTextBookmark */;
-			3332307D0B802C4100C403F5 = 3332307D0B802C4100C403F5 /* PBXTextBookmark */;
-			3332307E0B802C4100C403F5 = 3332307E0B802C4100C403F5 /* PBXTextBookmark */;
-			333230820B802C4D00C403F5 = 333230820B802C4D00C403F5 /* PBXTextBookmark */;
-			333230860B802C6100C403F5 = 333230860B802C6100C403F5 /* PBXTextBookmark */;
-			3332308B0B802C7100C403F5 = 3332308B0B802C7100C403F5 /* PBXTextBookmark */;
-			3332308C0B802C7100C403F5 = 3332308C0B802C7100C403F5 /* PBXTextBookmark */;
-			3332308E0B802C7A00C403F5 = 3332308E0B802C7A00C403F5 /* PBXTextBookmark */;
-			333230900B802C7A00C403F5 = 333230900B802C7A00C403F5 /* PBXTextBookmark */;
-			333230940B802C8B00C403F5 = 333230940B802C8B00C403F5 /* PBXTextBookmark */;
-			333230960B802C9A00C403F5 = 333230960B802C9A00C403F5 /* PBXTextBookmark */;
-			333230990B802C9A00C403F5 = 333230990B802C9A00C403F5 /* PBXTextBookmark */;
-			3332309A0B802C9A00C403F5 = 3332309A0B802C9A00C403F5 /* PBXTextBookmark */;
-			333230A30B802D4000C403F5 = 333230A30B802D4000C403F5 /* PBXTextBookmark */;
-			333230A40B802D4000C403F5 = 333230A40B802D4000C403F5 /* PBXTextBookmark */;
-			333230A60B802D4000C403F5 = 333230A60B802D4000C403F5 /* PBXTextBookmark */;
-			333230A70B802D4000C403F5 = 333230A70B802D4000C403F5 /* PBXTextBookmark */;
-			333230A80B802D4000C403F5 = 333230A80B802D4000C403F5 /* PBXTextBookmark */;
-			333230A90B802D4000C403F5 = 333230A90B802D4000C403F5 /* PBXTextBookmark */;
-			333230AA0B802D4000C403F5 = 333230AA0B802D4000C403F5 /* PBXTextBookmark */;
-			333230AB0B802D4000C403F5 = 333230AB0B802D4000C403F5 /* PBXTextBookmark */;
-			333230AC0B802D4000C403F5 = 333230AC0B802D4000C403F5 /* PBXTextBookmark */;
-			333230AD0B802D4000C403F5 = 333230AD0B802D4000C403F5 /* PBXTextBookmark */;
-			333230AF0B802D4000C403F5 = 333230AF0B802D4000C403F5 /* PBXTextBookmark */;
-			333230B20B802D4000C403F5 = 333230B20B802D4000C403F5 /* PBXTextBookmark */;
-			333230B40B802D4000C403F5 = 333230B40B802D4000C403F5 /* PBXTextBookmark */;
-			333230BA0B802D4000C403F5 = 333230BA0B802D4000C403F5 /* PBXTextBookmark */;
-			333230BE0B802D4000C403F5 = 333230BE0B802D4000C403F5 /* PBXTextBookmark */;
-			333230C00B802D4000C403F5 = 333230C00B802D4000C403F5 /* PBXTextBookmark */;
-			333230C20B802D4000C403F5 = 333230C20B802D4000C403F5 /* PBXTextBookmark */;
-			333231000B802FF000C403F5 = 333231000B802FF000C403F5 /* PBXTextBookmark */;
-			3357D0940BD4A3DB004B3223 /* PBXTextBookmark */ = 3357D0940BD4A3DB004B3223 /* PBXTextBookmark */;
-			3357D0A80BD4A44C004B3223 /* PBXTextBookmark */ = 3357D0A80BD4A44C004B3223 /* PBXTextBookmark */;
-			33B8460B0BD0A5CC00472F4E = 33B8460B0BD0A5CC00472F4E /* PBXTextBookmark */;
-			33B8460D0BD0A5CC00472F4E = 33B8460D0BD0A5CC00472F4E /* PBXTextBookmark */;
-			33B846130BD0A63200472F4E = 33B846130BD0A63200472F4E /* PBXTextBookmark */;
-			33B846400BD0A6EB00472F4E = 33B846400BD0A6EB00472F4E /* PBXTextBookmark */;
-			33B846570BD0A77800472F4E = 33B846570BD0A77800472F4E /* PBXTextBookmark */;
+			333230340B802B2C00C403F5 /* PBXTextBookmark */ = 333230340B802B2C00C403F5 /* PBXTextBookmark */;
+			333230360B802B2C00C403F5 /* PBXTextBookmark */ = 333230360B802B2C00C403F5 /* PBXTextBookmark */;
+			333230700B802C1B00C403F5 /* PBXTextBookmark */ = 333230700B802C1B00C403F5 /* PBXTextBookmark */;
+			333230740B802C2700C403F5 /* PBXTextBookmark */ = 333230740B802C2700C403F5 /* PBXTextBookmark */;
+			333230760B802C3300C403F5 /* PBXTextBookmark */ = 333230760B802C3300C403F5 /* PBXTextBookmark */;
+			333230780B802C3300C403F5 /* PBXTextBookmark */ = 333230780B802C3300C403F5 /* PBXTextBookmark */;
+			3332307B0B802C4100C403F5 /* PBXTextBookmark */ = 3332307B0B802C4100C403F5 /* PBXTextBookmark */;
+			3332307D0B802C4100C403F5 /* PBXTextBookmark */ = 3332307D0B802C4100C403F5 /* PBXTextBookmark */;
+			3332307E0B802C4100C403F5 /* PBXTextBookmark */ = 3332307E0B802C4100C403F5 /* PBXTextBookmark */;
+			333230820B802C4D00C403F5 /* PBXTextBookmark */ = 333230820B802C4D00C403F5 /* PBXTextBookmark */;
+			333230860B802C6100C403F5 /* PBXTextBookmark */ = 333230860B802C6100C403F5 /* PBXTextBookmark */;
+			3332308B0B802C7100C403F5 /* PBXTextBookmark */ = 3332308B0B802C7100C403F5 /* PBXTextBookmark */;
+			3332308C0B802C7100C403F5 /* PBXTextBookmark */ = 3332308C0B802C7100C403F5 /* PBXTextBookmark */;
+			3332308E0B802C7A00C403F5 /* PBXTextBookmark */ = 3332308E0B802C7A00C403F5 /* PBXTextBookmark */;
+			333230900B802C7A00C403F5 /* PBXTextBookmark */ = 333230900B802C7A00C403F5 /* PBXTextBookmark */;
+			333230940B802C8B00C403F5 /* PBXTextBookmark */ = 333230940B802C8B00C403F5 /* PBXTextBookmark */;
+			333230960B802C9A00C403F5 /* PBXTextBookmark */ = 333230960B802C9A00C403F5 /* PBXTextBookmark */;
+			333230990B802C9A00C403F5 /* PBXTextBookmark */ = 333230990B802C9A00C403F5 /* PBXTextBookmark */;
+			3332309A0B802C9A00C403F5 /* PBXTextBookmark */ = 3332309A0B802C9A00C403F5 /* PBXTextBookmark */;
+			333230A30B802D4000C403F5 /* PBXTextBookmark */ = 333230A30B802D4000C403F5 /* PBXTextBookmark */;
+			333230A40B802D4000C403F5 /* PBXTextBookmark */ = 333230A40B802D4000C403F5 /* PBXTextBookmark */;
+			333230A70B802D4000C403F5 /* PBXTextBookmark */ = 333230A70B802D4000C403F5 /* PBXTextBookmark */;
+			333230A80B802D4000C403F5 /* PBXTextBookmark */ = 333230A80B802D4000C403F5 /* PBXTextBookmark */;
+			333230A90B802D4000C403F5 /* PBXTextBookmark */ = 333230A90B802D4000C403F5 /* PBXTextBookmark */;
+			333230AA0B802D4000C403F5 /* PBXTextBookmark */ = 333230AA0B802D4000C403F5 /* PBXTextBookmark */;
+			333230AB0B802D4000C403F5 /* PBXTextBookmark */ = 333230AB0B802D4000C403F5 /* PBXTextBookmark */;
+			333230AC0B802D4000C403F5 /* PBXTextBookmark */ = 333230AC0B802D4000C403F5 /* PBXTextBookmark */;
+			333230AD0B802D4000C403F5 /* PBXTextBookmark */ = 333230AD0B802D4000C403F5 /* PBXTextBookmark */;
+			333230AF0B802D4000C403F5 /* PBXTextBookmark */ = 333230AF0B802D4000C403F5 /* PBXTextBookmark */;
+			333230B20B802D4000C403F5 /* PBXTextBookmark */ = 333230B20B802D4000C403F5 /* PBXTextBookmark */;
+			333230B40B802D4000C403F5 /* PBXTextBookmark */ = 333230B40B802D4000C403F5 /* PBXTextBookmark */;
+			333230BA0B802D4000C403F5 /* PBXTextBookmark */ = 333230BA0B802D4000C403F5 /* PBXTextBookmark */;
+			333230BE0B802D4000C403F5 /* PBXTextBookmark */ = 333230BE0B802D4000C403F5 /* PBXTextBookmark */;
+			333230C00B802D4000C403F5 /* PBXTextBookmark */ = 333230C00B802D4000C403F5 /* PBXTextBookmark */;
+			333230C20B802D4000C403F5 /* PBXTextBookmark */ = 333230C20B802D4000C403F5 /* PBXTextBookmark */;
+			333231000B802FF000C403F5 /* PBXTextBookmark */ = 333231000B802FF000C403F5 /* PBXTextBookmark */;
+			3357D0B80BD4A651004B3223 /* PBXTextBookmark */ = 3357D0B80BD4A651004B3223 /* PBXTextBookmark */;
+			3357D0B90BD4A651004B3223 /* PBXTextBookmark */ = 3357D0B90BD4A651004B3223 /* PBXTextBookmark */;
+			3357D0BA0BD4A651004B3223 /* PBXTextBookmark */ = 3357D0BA0BD4A651004B3223 /* PBXTextBookmark */;
+			3357D0BB0BD4A651004B3223 /* PBXTextBookmark */ = 3357D0BB0BD4A651004B3223 /* PBXTextBookmark */;
+			33B8460B0BD0A5CC00472F4E /* PBXTextBookmark */ = 33B8460B0BD0A5CC00472F4E /* PBXTextBookmark */;
+			33B8460D0BD0A5CC00472F4E /* PBXTextBookmark */ = 33B8460D0BD0A5CC00472F4E /* PBXTextBookmark */;
+			33B846130BD0A63200472F4E /* PBXTextBookmark */ = 33B846130BD0A63200472F4E /* PBXTextBookmark */;
+			33B846400BD0A6EB00472F4E /* PBXTextBookmark */ = 33B846400BD0A6EB00472F4E /* PBXTextBookmark */;
 		};
 		sourceControlManager = 33AD82DA0B80264000CF4200 /* Source Control */;
 		userBuildSettings = {
 		};
 	};
-	333106140BD0A8DE00A43EF0 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 33AD82E40B80269C00CF4200 /* datetime.cc */;
-		name = "static std::time_t base = -1;";
-		rLen = 32;
-		rLoc = 550;
-		rType = 0;
-		vrLen = 610;
-		vrLoc = 424;
-	};
 	333230340B802B2C00C403F5 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 33AD82F00B80269C00CF4200 /* format.cc */;
@@ -385,16 +374,6 @@
 		vrLen = 775;
 		vrLoc = 0;
 	};
-	333230A60B802D4000C403F5 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 33AD82DC0B80269C00CF4200 /* amount.cc */;
-		name = "amount.cc: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 801;
-		vrLoc = 0;
-	};
 	333230A70B802D4000C403F5 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 33AD82F40B80269C00CF4200 /* journal.cc */;
@@ -566,25 +545,43 @@
 			sepNavVisRect = "{{0, 2231}, {689, 236}}";
 		};
 	};
-	3357D0940BD4A3DB004B3223 /* PBXTextBookmark */ = {
+	3357D0B80BD4A651004B3223 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 33AD82E40B80269C00CF4200 /* datetime.cc */;
 		name = "static std::time_t base = -1;";
 		rLen = 32;
 		rLoc = 550;
 		rType = 0;
-		vrLen = 610;
-		vrLoc = 424;
+		vrLen = 473;
+		vrLoc = 240;
 	};
-	3357D0A80BD4A44C004B3223 /* PBXTextBookmark */ = {
+	3357D0B90BD4A651004B3223 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		comments = "warning: control reaches end of non-void function";
+		fRef = 33AD82DC0B80269C00CF4200 /* amount.cc */;
+		rLen = 1;
+		rLoc = 1226;
+		rType = 1;
+	};
+	3357D0BA0BD4A651004B3223 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 33AD82E40B80269C00CF4200 /* datetime.cc */;
 		name = "static std::time_t base = -1;";
 		rLen = 32;
 		rLoc = 550;
 		rType = 0;
-		vrLen = 610;
-		vrLoc = 424;
+		vrLen = 473;
+		vrLoc = 240;
+	};
+	3357D0BB0BD4A651004B3223 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 33AD82DC0B80269C00CF4200 /* amount.cc */;
+		name = "amount.cc: 2046";
+		rLen = 0;
+		rLoc = 51254;
+		rType = 0;
+		vrLen = 580;
+		vrLoc = 29938;
 	};
 	33AD82D60B80262200CF4200 /* ledger */ = {
 		isa = PBXExecutable;
@@ -623,11 +620,11 @@
 	33AD82DA0B80264000CF4200 /* Source Control */ = {
 		isa = PBXSourceControlManager;
 		fallbackIsa = XCSourceControlManager;
-		isSCMEnabled = 1;
+		isSCMEnabled = 0;
 		scmConfiguration = {
 			SubversionToolPath = /usr/local/bin/svn;
 		};
-		scmType = scm.subversion;
+		scmType = "";
 	};
 	33AD82DB0B80264000CF4200 /* Code sense */ = {
 		isa = PBXCodeSenseManager;
@@ -635,9 +632,9 @@
 	};
 	33AD82DC0B80269C00CF4200 /* amount.cc */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {794, 37152}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRect = "{{0, 0}, {792, 745}}";
+			sepNavIntBoundsRect = "{{0, 0}, {794, 36828}}";
+			sepNavSelRange = "{51254, 0}";
+			sepNavVisRect = "{{0, 21942}, {689, 236}}";
 		};
 	};
 	33AD82DD0B80269C00CF4200 /* amount.h */ = {
@@ -679,7 +676,7 @@
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {792, 10368}}";
 			sepNavSelRange = "{550, 32}";
-			sepNavVisRect = "{{0, 378}, {792, 512}}";
+			sepNavVisRect = "{{0, 219}, {792, 512}}";
 		};
 	};
 	33AD82E80B80269C00CF4200 /* derive.cc */ = {
@@ -848,16 +845,6 @@
 		vrLen = 613;
 		vrLoc = 1552;
 	};
-	33B846570BD0A77800472F4E /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 33AD82E40B80269C00CF4200 /* datetime.cc */;
-		name = "static std::time_t base = -1;";
-		rLen = 32;
-		rLoc = 550;
-		rType = 0;
-		vrLen = 699;
-		vrLoc = 424;
-	};
 	8DD76F620486A84900D96B5E /* ledger */ = {
 		activeExec = 0;
 		executables = (