Bug 391409 - "Cleaning up all OS widget makefiles" [p=xfsunoles@gmail.com (Jonathan Steele) r+sr+a1.9=roc]

This commit is contained in:
reed@reedloden.com 2007-09-15 18:37:43 -07:00
parent 6c8d54ddfb
commit f04c9cc7af
4 changed files with 12 additions and 23 deletions

View File

@ -68,12 +68,10 @@ REQUIRES = xpcom \
pref \
view \
locale \
cairo \
thebes \
$(NULL)
ifdef MOZ_ENABLE_CAIRO_GFX
REQUIRES += cairo thebes
endif
CPPSRCS = \
nsAppShell.cpp \
nsBidiKeyboard.cpp \
@ -102,12 +100,9 @@ EXTRA_DSO_LDOPTS = \
$(MOZ_COMPONENT_LIBS) \
-lgkgfx \
$(TK_LIBS) \
-lthebes \
$(NULL)
ifdef MOZ_ENABLE_CAIRO_GFX
EXTRA_DSO_LDOPTS += -lthebes
endif
include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_NS_WIDGET -I$(srcdir)/../xpwidgets -I$(srcdir)

View File

@ -60,12 +60,10 @@ REQUIRES = xpcom \
dom \
timer \
accessibility \
thebes \
cairo \
$(NULL)
ifeq ($(MOZ_ENABLE_CAIRO_GFX),1)
REQUIRES += thebes cairo
endif
CPPSRCS = nsWinWidgetFactory.cpp
EXTRA_DSO_LIBS = gkgfx

View File

@ -70,12 +70,10 @@ REQUIRES = xpcom \
uriloader \
webbrowserpersist \
unicharutil \
thebes \
cairo \
$(NULL)
ifdef MOZ_ENABLE_CAIRO_GFX
REQUIRES += thebes cairo
endif
CPPSRCS = \
L_Ienumfe.cpp \
nsWindow.cpp \

View File

@ -62,12 +62,10 @@ REQUIRES = xpcom \
view \
windowwatcher \
lcms \
thebes \
cairo \
$(NULL)
ifeq ($(MOZ_ENABLE_CAIRO_GFX),1)
REQUIRES += thebes cairo
endif
DEFINES += -D_IMPL_NS_WIDGET -DUSE_TLS_FOR_TOOLKIT
CPPSRCS = \
@ -86,16 +84,16 @@ CPPSRCS = \
nsIdleService.cpp \
$(NULL)
ifneq (,$(filter beos os2 mac cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
ifneq (,$(filter beos os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
CPPSRCS += nsBaseClipboard.cpp
endif
ifneq (,$(filter beos gtk2 os2 mac cocoa photon windows,$(MOZ_WIDGET_TOOLKIT)))
ifneq (,$(filter beos gtk2 os2 cocoa photon windows,$(MOZ_WIDGET_TOOLKIT)))
CPPSRCS += nsBaseFilePicker.cpp
REQUIRES += docshell view intl
endif
ifneq (,$(filter gtk2 windows mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifneq (,$(filter gtk2 windows cocoa,$(MOZ_WIDGET_TOOLKIT)))
CPPSRCS += nsNativeTheme.cpp
endif