blob: 12c3f0bf8392c713e1561363e3508d79043dab84 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
--- browser/app/Makefile.in 2011-09-28 22:24:36.000000000 +0200
+++ ../../ff6/mozilla-release/browser/app/Makefile.in 2011-09-02 22:15:19.000000000 +0200
@@ -92,22 +91,35 @@
else
# Build a binary bootstrapping with XRE_main
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
+else
+PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
+endif
CPPSRCS = nsBrowserApp.cpp
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
-LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build
-DEFINES += -DXPCOM_GLUE
-STL_FLAGS=
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+LIBS += $(DIST)/bin/XUL
+TK_LIBS := $(TK_LIBS)
+else
+EXTRA_DSO_LIBS += xul
+endif
LIBS += \
+ $(STATIC_COMPONENTS_LINKER_PATH) \
$(EXTRA_DSO_LIBS) \
- $(XPCOM_STANDALONE_GLUE_LDOPTS) \
+ $(XPCOM_GLUE_LDOPTS) \
+ $(NSPR_LIBS) \
$(NULL)
+ifdef MOZ_JPROF
+LIBS += -ljprof
+endif
+
ifndef MOZ_WINCONSOLE
ifdef MOZ_DEBUG
MOZ_WINCONSOLE = 1
@@ -182,9 +194,18 @@
ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
-libs::
- cp -p $(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
+$(MOZ_APP_NAME):: $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS)
+ cat $< | sed -e "s|%MOZAPPDIR%|$(installdir)|" \
+ -e "s|%MOZ_APP_DISPLAYNAME%|$(MOZ_APP_DISPLAYNAME)|" > $@
+ chmod +x $@
+
+libs:: $(MOZ_APP_NAME)
+ $(INSTALL) $< $(DIST)/bin
+
+install:: $(MOZ_APP_NAME)
+ $(SYSINSTALL) $< $(DESTDIR)$(bindir)
+GARBAGE += $(MOZ_APP_NAME)
GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, firefox.js)
endif
|
