Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 397834 - "Clean up gfx and gfx/src makefiles" [p=xfsunoles@gmail.com (Jonathan Steele) r+sr+a1.9=roc]

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@237062 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
reed%reedloden.com 2007-10-02 07:39:20 +00:00
parent b4719d7bba
commit fddea9aec0
2 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/gfx/Makefile.in
View File

@ -48,11 +48,7 @@ ifdef MOZ_TREE_CAIRO
DIRS = cairo DIRS = cairo
endif endif
ifdef MOZ_ENABLE_CAIRO_GFX DIRS += thebes public idl src
DIRS += thebes
endif
DIRS += public idl src
ifdef ENABLE_TESTS ifdef ENABLE_TESTS
ifndef MOZ_ENABLE_LIBXUL ifndef MOZ_ENABLE_LIBXUL

24
mozilla/gfx/src/Makefile.in
View File

@ -62,25 +62,15 @@ REQUIRES = xpcom \
thebes \ thebes \
$(NULL) $(NULL)
DIRS = shared DIRS = shared thebes
ifdef MOZ_ENABLE_POSTSCRIPT ifdef MOZ_ENABLE_POSTSCRIPT
DIRS += psshared DIRS += psshared
endif endif
ifdef MOZ_ENABLE_CAIRO_GFX
DIRS += thebes
else
ifdef MOZ_ENABLE_PHOTON ifdef MOZ_ENABLE_PHOTON
DIRS += photon DIRS += photon
endif endif
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
DIRS += mac
endif
ifneq (,$(filter windows beos mac,$(MOZ_WIDGET_TOOLKIT)))
DIRS += $(MOZ_WIDGET_TOOLKIT)
endif
endif
CPPSRCS = \ CPPSRCS = \
nsColor.cpp \ nsColor.cpp \
@ -98,23 +88,13 @@ ifeq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
REQUIRES += uconv REQUIRES += uconv
endif endif
ifneq (,$(filter beos windows os2,$(MOZ_WIDGET_TOOLKIT)))
CPPSRCS += imgScaler.cpp
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
CPPSRCS += \
mac/nsRegionPool.cpp \
$(NULL)
endif
EXTRA_DSO_LDOPTS = \ EXTRA_DSO_LDOPTS = \
$(DEPTH)/modules/libutil/src/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) \ $(DEPTH)/modules/libutil/src/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) \
$(MOZ_UNICHARUTIL_LIBS) \ $(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \ $(MOZ_COMPONENT_LIBS) \
$(NULL) $(NULL)
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) ifeq(cocoa,$(MOZ_WIDGET_TOOLKIT))
EXTRA_DSO_LDOPTS += \ EXTRA_DSO_LDOPTS += \
$(TK_LIBS) \ $(TK_LIBS) \
$(NULL) $(NULL)