| author | Wolfgang Rosenauer <wr@rosenauer.org> |
| Wed, 21 Sep 2011 12:31:47 +0200 | |
| branch | mozilla-1.9.2 |
| changeset 331 | ea85aeecf72f |
| parent 202 | 3306109c5899 |
| permissions | -rw-r--r-- |
|
151
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
# HG changeset patch |
|
202
3306109c5899
prepare 1.9.2.13/3.6.13 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
152
diff
changeset
|
2 |
# Parent ca3a2bf92df09c5425fa1b2486366d40ed757fa1 |
| 152 | 3 |
Fix compilation with Gnome > 2.30 |
4 |
||
|
151
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in |
|
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
--- a/toolkit/system/gnome/Makefile.in |
|
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
7 |
+++ b/toolkit/system/gnome/Makefile.in |
|
202
3306109c5899
prepare 1.9.2.13/3.6.13 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
152
diff
changeset
|
8 |
@@ -77,21 +77,23 @@ endif |
|
151
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
9 |
EXTRA_DSO_LDOPTS += \ |
|
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
10 |
$(XPCOM_GLUE_LDOPTS) \ |
|
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
11 |
$(XPCOM_FROZEN_LDOPTS) \ |
|
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
12 |
$(NSPR_LIBS) \ |
|
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
13 |
$(MOZ_GCONF_LIBS) \ |
|
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
14 |
$(MOZ_GNOMEVFS_LIBS) \ |
|
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
$(GLIB_LIBS) \ |
|
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
16 |
$(MOZ_LIBNOTIFY_LIBS) \ |
|
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
17 |
+ $(MOZ_GTK2_LIBS) \ |
|
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
$(NULL) |
|
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
19 |
|
|
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
20 |
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/ |
|
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
21 |
|
|
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
22 |
include $(topsrcdir)/config/rules.mk |
|
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
23 |
|
|
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
24 |
CXXFLAGS += \ |
|
202
3306109c5899
prepare 1.9.2.13/3.6.13 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
152
diff
changeset
|
25 |
$(MOZ_GTK2_CFLAGS) \ |
|
151
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
26 |
$(MOZ_GCONF_CFLAGS) \ |
|
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
27 |
$(MOZ_GNOMEVFS_CFLAGS) \ |
|
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
28 |
$(GLIB_CFLAGS) \ |
|
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
29 |
$(MOZ_LIBNOTIFY_CFLAGS) \ |
| 152 | 30 |
+ $(MOZ_GTK2_CFLAGS) \ |
|
151
4b31c799a73f
fix build with latest Gnome
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
31 |
$(NULL) |