Bug 532573 - Remove old MOZILLA_1_9_1_BRANCH ifdefs from calendar code [r=philipp]
authorStefan Sitter <ssitter@gmail.com>
Sat, 29 May 2010 03:55:26 +0200
changeset 5745 55b715a0f0cb47760ff27f79e4c59053f22963b0
parent 5744 07eaa92684b8666c3795463588f3a713ff29b7e2
child 5746 232288e6614ca951cf7636f9af59f20d0e989930
push idunknown
push userunknown
push dateunknown
reviewersphilipp
bugs532573
Bug 532573 - Remove old MOZILLA_1_9_1_BRANCH ifdefs from calendar code [r=philipp]
calendar/lightning/Makefile.in
calendar/providers/gdata/Makefile.in
calendar/sunbird/app/Makefile.in
calendar/timezones/Makefile.in
--- a/calendar/lightning/Makefile.in
+++ b/calendar/lightning/Makefile.in
@@ -55,21 +55,17 @@ DIST_FILES = install.rdf
 PREF_JS_EXPORTS = $(srcdir)/content/lightning.js
 ifdef MOZILLA_1_9_2_BRANCH
 LIGHTNING_VERSION := $(shell cat $(srcdir)/../sunbird/config/version-192.txt)
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-192.txt)
 else
 LIGHTNING_VERSION := $(shell cat $(srcdir)/../sunbird/config/version.txt)
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
 endif
-ifdef MOZILLA_1_9_1_BRANCH
-SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version-191.txt)
-else
 SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version.txt)
-endif
 ifdef LIGHTNING_FIREFOX
 FIREFOX_VERSION := $(shell cat $(MOZILLA_SRCDIR)/browser/config/version.txt)
 endif
 
 ifneq (,$(findstring pre,$(LIGHTNING_VERSION)))
 DEFINES += -DLIGHTNING_PRERELEASE_VERSION=1
 endif
 
--- a/calendar/providers/gdata/Makefile.in
+++ b/calendar/providers/gdata/Makefile.in
@@ -51,21 +51,17 @@ STRIP_XPI = 1
 
 ifdef MOZILLA_1_9_2_BRANCH
 CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version-192.txt)
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-192.txt)
 else
 CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version.txt)
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
 endif
-ifdef MOZILLA_1_9_1_BRANCH
-SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version-191.txt)
-else
 SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version.txt)
-endif
 DEFINES += -DAB_CD=$(AB_CD) \
            -DCALENDAR_VERSION=$(CALENDAR_VERSION) \
            -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
            -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
            -DCOMM_BUILD=$(COMM_BUILD) \
            $(NULL)
 
 PREF_JS_EXPORTS = $(srcdir)/defaults/preferences.js
--- a/calendar/sunbird/app/Makefile.in
+++ b/calendar/sunbird/app/Makefile.in
@@ -179,26 +179,24 @@ EXTRA_DEPS	+= \
 	$(STATIC_EXTRA_DEPS) \
 	$(NULL)
 DEFINES		+= $(STATIC_DEFINES)
 CPPSRCS		+= $(STATIC_CPPSRCS)
 EXTRA_DSO_LIBS	+= $(STATIC_EXTRA_DSO_LIBS)
 REQUIRES	+= $(STATIC_REQUIRES)
 EXTRA_LIBS	+= $(STATIC_EXTRA_LIBS)
 
-ifndef MOZILLA_1_9_1_BRANCH
 ifndef MOZILLA_1_9_2_BRANCH
 
 # OpenGL is required by (mozilla/)content/canvas: see (mozilla/)layout/build/Makefile.in.
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 OS_LIBS += -framework OpenGL
 endif
 
 endif # MOZILLA_1_9_2_BRANCH
-endif # MOZILLA_1_9_1_BRANCH
 
 endif # BUILD_STATIC_LIBS
 
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
 OS_LIBS += $(call EXPAND_LIBNAME,usp10 msimg32)
 RCINCLUDE = splash.rc
 ifndef GNU_CC
--- a/calendar/timezones/Makefile.in
+++ b/calendar/timezones/Makefile.in
@@ -78,21 +78,17 @@ endif
 
 ifdef MOZILLA_1_9_2_BRANCH
 CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version-192.txt)
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-192.txt)
 else
 CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version.txt)
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
 endif
-ifdef MOZILLA_1_9_1_BRANCH
-SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version-191.txt)
-else
 SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version.txt)
-endif
 TIMEZONES_VERSION := $(shell cat $(srcdir)/config/version.txt)
 
 DEFINES += -DAB_CD=$(AB_CD) \
            -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
            -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
            -DCALENDAR_VERSION=$(CALENDAR_VERSION) \
            -DTIMEZONES_VERSION=$(TIMEZONES_VERSION) \
            $(NULL)