Lines 198-213
Link Here
|
198 |
-lgkgfx \ |
198 |
-lgkgfx \ |
199 |
$(GFX_XINERAMA_LIBS) \ |
199 |
$(GFX_XINERAMA_LIBS) \ |
200 |
$(MOZ_JS_LIBS) \ |
200 |
$(MOZ_JS_LIBS) \ |
201 |
$(MOZ_UNICHARUTIL_LIBS) \ |
201 |
$(MOZ_UNICHARUTIL_LIBS) \ |
202 |
$(MOZ_COMPONENT_LIBS) \ |
202 |
$(MOZ_COMPONENT_LIBS) \ |
203 |
$(NULL) |
203 |
$(NULL) |
204 |
endif |
204 |
endif |
205 |
|
205 |
|
|
|
206 |
ifdef MOZ_ENABLE_PANGO |
207 |
EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS) |
208 |
endif |
209 |
|
206 |
EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS) |
210 |
EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS) |
207 |
CXXFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) |
211 |
CXXFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) |
208 |
CFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) |
212 |
CFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) |
209 |
|
213 |
|
210 |
ifeq ($(OS_ARCH), SunOS) |
214 |
ifeq ($(OS_ARCH), SunOS) |
211 |
ifndef GNU_CC |
215 |
ifndef GNU_CC |
212 |
# When using Sun's WorkShop compiler, including |
216 |
# When using Sun's WorkShop compiler, including |
213 |
# /wherever/workshop-5.0/SC5.0/include/CC/std/time.hIndex: mozilla/config/static-config.mk |
217 |
# /wherever/workshop-5.0/SC5.0/include/CC/std/time.hIndex: mozilla/config/static-config.mk |
Lines 110-125
Link Here
|
110 |
$(MOZ_XIE_LIBS) \ |
110 |
$(MOZ_XIE_LIBS) \ |
111 |
$(NULL) |
111 |
$(NULL) |
112 |
endif |
112 |
endif |
113 |
|
113 |
|
114 |
ifdef MOZ_ENABLE_XPRINT |
114 |
ifdef MOZ_ENABLE_XPRINT |
115 |
STATIC_EXTRA_LIBS += $(MOZ_XPRINT_LDFLAGS) |
115 |
STATIC_EXTRA_LIBS += $(MOZ_XPRINT_LDFLAGS) |
116 |
endif |
116 |
endif |
117 |
|
117 |
|
|
|
118 |
ifdef MOZ_ENABLE_XFT |
119 |
STATIC_EXTRA_LIBS += $(MOZ_XFT_LIBS) |
120 |
endif |
121 |
|
122 |
ifdef MOZ_ENABLE_PANGO |
123 |
STATIC_EXTRA_LIBS += $(MOZ_PANGO_LIBS) |
124 |
endif |
125 |
|
118 |
# Component Makefile always brings in this. |
126 |
# Component Makefile always brings in this. |
119 |
# STATIC_EXTRA_LIBS += $(TK_LIBS) |
127 |
# STATIC_EXTRA_LIBS += $(TK_LIBS) |
120 |
|
128 |
|
121 |
# Some random modules require this |
129 |
# Some random modules require this |
122 |
ifndef MINIMO |
130 |
ifndef MINIMO |
123 |
STATIC_EXTRA_LIBS += $(MOZ_XPCOM_OBSOLETE_LIBS) |
131 |
STATIC_EXTRA_LIBS += $(MOZ_XPCOM_OBSOLETE_LIBS) |
124 |
endif |
132 |
endif |
125 |
|
133 |
|