From dee7b5b5f49892d26e04e1cc00207432b09553bb Mon Sep 17 00:00:00 2001 From: "mostafah%oeone.com" Date: Fri, 18 Jun 2004 17:50:08 +0000 Subject: [PATCH] Brought up to date with Makefile.in in browser/app --- calendar/sunbird/app/Makefile.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/calendar/sunbird/app/Makefile.in b/calendar/sunbird/app/Makefile.in index 02895eaf4487..ac39c8b5f9f4 100644 --- a/calendar/sunbird/app/Makefile.in +++ b/calendar/sunbird/app/Makefile.in @@ -67,7 +67,7 @@ ifdef BUILD_STATIC_LIBS STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components endif -ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) +ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) TK_LIBS := -framework Cocoa $(TK_LIBS) endif @@ -98,6 +98,8 @@ MOZ_WINCONSOLE = 0 endif endif +NSDISTMODE = copy + include $(topsrcdir)/config/config.mk ifndef BUILD_STATIC_LIBS @@ -163,6 +165,9 @@ endif APP_VERSION = $(shell cat $(srcdir)/../config/version.txt) DEFINES += -DAPP_VERSION=\"$(APP_VERSION)\" +BUILD_ID = $(shell cat $(DEPTH)/config/build_number) +DEFINES += -DBUILD_ID=\"$(BUILD_ID)\" + ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) ifdef BUILD_STATIC_LIBS LIBS += -framework QuickTime -framework IOKit