зеркало из https://github.com/mozilla/pjs.git
Fix link ordering problem when building static components with static gtk.
Bug #136192 r=bryner
This commit is contained in:
Родитель
63ca4d0d52
Коммит
ce6ee72484
|
@ -27,7 +27,6 @@ include $(DEPTH)/config/autoconf.mk
|
|||
|
||||
MODULE = gtkembedmoz
|
||||
LIBRARY_NAME = gtkembedmoz
|
||||
EXPORT_LIBRARY = 1
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
docshell \
|
||||
|
|
|
@ -42,26 +42,14 @@ SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=)
|
|||
# ENABLE_GNOME=1
|
||||
|
||||
ifdef ENABLE_GNOME
|
||||
|
||||
CPPSRCS += TestGtkEmbedMDI.cpp
|
||||
|
||||
LIBS = \
|
||||
-lgtkembedmoz \
|
||||
-lgtksuperwin \
|
||||
`gnome-config --libs gnomeui` \
|
||||
$(TK_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
else
|
||||
|
||||
LIBS = \
|
||||
-lgtkembedmoz \
|
||||
-lgtksuperwin \
|
||||
$(TK_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
endif
|
||||
|
||||
LIBS += \
|
||||
-lgtkembedmoz \
|
||||
-lgtksuperwin \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
ifdef BUILD_STATIC_LIBS
|
||||
|
@ -83,16 +71,17 @@ EXTRA_LIBS += $(MOZ_COMPONENT_LIBS)
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
CXXFLAGS += $(MOZ_GTK_CFLAGS)
|
||||
|
||||
ifdef ENABLE_GNOME
|
||||
|
||||
CXXFLAGS += $(MOZ_GTK_CFLAGS) `gnome-config --cflags gnomeui`
|
||||
|
||||
else
|
||||
|
||||
CXXFLAGS += $(MOZ_GTK_CFLAGS)
|
||||
|
||||
CXXFLAGS += `gnome-config --cflags gnomeui`
|
||||
EXTRA_LIBS += `gnome-config --libs gnomeui`
|
||||
endif
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(TK_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
ifeq ($(OS_ARCH), SunOS)
|
||||
ifndef GNU_CC
|
||||
# When using Sun's WorkShop compiler, including
|
||||
|
|
Загрузка…
Ссылка в новой задаче