Use non-standard OBJ_SUFFIX so that we can safely use VPATH to grab files from other srcdirs and allow people to build in the srctree.
Bug #100851 r=jag git-svn-id: svn://10.0.0.236/trunk@103507 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
2217a54fa7
commit
84a5dfec4b
@ -77,12 +77,17 @@ CXXFLAGS += $(MOZ_XPRINT_CFLAGS)
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
# use different MDDEPDIR to work around an issue with multiple dirs
|
||||
# in VPATH (that was bug 87422)
|
||||
# use different MDDEPDIR & OBJ_SUFFIX to work around objs in srcdir/VPATH
|
||||
# issue (bug 87422 & 100851)
|
||||
MDDEPDIR := $(MDDEPDIR)_vpath
|
||||
ORIG_OBJ_SUFFIX := $(OBJ_SUFFIX)
|
||||
OBJ_SUFFIX := xp.$(OBJ_SUFFIX)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
clean clobber clobber_all realclean distclean::
|
||||
-$(RM) -f $(wildcard *.$(ORIG_OBJ_SUFFIX))
|
||||
|
||||
DEFINES += -D_IMPL_NS_GFXONXP -DUSE_MOZILLA_TYPES -DUSE_XPRINT
|
||||
ifeq ($(OS_ARCH), Linux)
|
||||
DEFINES += -D_BSD_SOURCE
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user