Monotone-Parent: 10ffe772d1b4699a4fc8aa41c3f3354e492d3e35

Monotone-Revision: 2f3c94605759601f796021ed2469cb5eb7910364

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-03-30T15:01:55
Monotone-Branch: ca.inverse.sogo

Main/GNUmakefile.preamble

@@ -1,10 +1,7 @@
 # compile settings
 
 ADDITIONAL_CPPFLAGS += \
-        -D_GNU_SOURCE \
-        -DSOGO_MAJOR_VERSION=$(MAJOR_VERSION) \
-        -DSOGO_MINOR_VERSION=$(MINOR_VERSION) \
-        -DSOGO_SUBMINOR_VERSION=$(SUBMINOR_VERSION)
+        -D_GNU_SOURCE
 
 ADDITIONAL_INCLUDE_DIRS += \
         -I../SOPE/ \

Main/SOGo.m

@@ -106,9 +106,8 @@ static BOOL debugLeaks;
   SoClassSecurityInfo *sInfo;
   NSArray *basicRoles;
 
-  [self logWithFormat: @"version %d.%d.%d (build %@) -- starting",
-        SOGO_MAJOR_VERSION, SOGO_MINOR_VERSION, SOGO_SUBMINOR_VERSION,
-        SOGoBuildDate];
+  [self logWithFormat: @"version %@ (build %@) -- starting",
+        SOGoVersion, SOGoBuildDate];
 
   defaults = [SOGoSystemDefaults sharedSystemDefaults];
   doCrashOnSessionCreate = [defaults crashOnSessionCreate];