equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent bad58443f421fd09ef6366d359b8405ed50c3731 |
2 # Parent ca3a2bf92df09c5425fa1b2486366d40ed757fa1 |
3 Fix compilation with Gnome > 2.30 |
3 Fix compilation with Gnome > 2.30 |
4 |
4 |
5 diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in |
5 diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in |
6 --- a/toolkit/system/gnome/Makefile.in |
6 --- a/toolkit/system/gnome/Makefile.in |
7 +++ b/toolkit/system/gnome/Makefile.in |
7 +++ b/toolkit/system/gnome/Makefile.in |
8 @@ -77,20 +77,22 @@ endif |
8 @@ -77,21 +77,23 @@ endif |
9 EXTRA_DSO_LDOPTS += \ |
9 EXTRA_DSO_LDOPTS += \ |
10 $(XPCOM_GLUE_LDOPTS) \ |
10 $(XPCOM_GLUE_LDOPTS) \ |
11 $(XPCOM_FROZEN_LDOPTS) \ |
11 $(XPCOM_FROZEN_LDOPTS) \ |
12 $(NSPR_LIBS) \ |
12 $(NSPR_LIBS) \ |
13 $(MOZ_GCONF_LIBS) \ |
13 $(MOZ_GCONF_LIBS) \ |
20 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/ |
20 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/ |
21 |
21 |
22 include $(topsrcdir)/config/rules.mk |
22 include $(topsrcdir)/config/rules.mk |
23 |
23 |
24 CXXFLAGS += \ |
24 CXXFLAGS += \ |
|
25 $(MOZ_GTK2_CFLAGS) \ |
25 $(MOZ_GCONF_CFLAGS) \ |
26 $(MOZ_GCONF_CFLAGS) \ |
26 $(MOZ_GNOMEVFS_CFLAGS) \ |
27 $(MOZ_GNOMEVFS_CFLAGS) \ |
27 $(GLIB_CFLAGS) \ |
28 $(GLIB_CFLAGS) \ |
28 $(MOZ_LIBNOTIFY_CFLAGS) \ |
29 $(MOZ_LIBNOTIFY_CFLAGS) \ |
29 + $(MOZ_GTK2_CFLAGS) \ |
30 + $(MOZ_GTK2_CFLAGS) \ |