From 4328d1be0936fc0069cdd7c874e4cbce8a77ed4f Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Fri, 27 Jul 2012 14:15:01 -0400 Subject: [PATCH] Bug 778220 - remove $(wildcard *.$(OBJ_SUFFIX)) calls from xpcom Makefiles; r=glandium --- xpcom/build/Makefile.in | 2 +- xpcom/glue/standalone/Makefile.in | 2 +- xpcom/glue/standalone/staticruntime/Makefile.in | 2 +- xpcom/glue/staticruntime/Makefile.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in index a0e4f049bbe9..62862ce024e1 100644 --- a/xpcom/build/Makefile.in +++ b/xpcom/build/Makefile.in @@ -113,7 +113,7 @@ EXPORTS_mozilla += perfprobe.h endif -GARBAGE += $(XPCOM_GLUE_SRC_LCPPSRCS) $(XPCOM_GLUENS_SRC_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX)) +GARBAGE += $(XPCOM_GLUE_SRC_LCPPSRCS) $(XPCOM_GLUENS_SRC_LCPPSRCS) include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/xpcom/glue/standalone/Makefile.in b/xpcom/glue/standalone/Makefile.in index 1d44917f8c1a..30fe5ede444f 100644 --- a/xpcom/glue/standalone/Makefile.in +++ b/xpcom/glue/standalone/Makefile.in @@ -70,7 +70,7 @@ FORCE_STATIC_LIB = 1 # Don't use STL wrappers here (i.e. wrapped ); they require mozalloc STL_FLAGS = -GARBAGE += $(XPCOM_GLUE_SRC_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX)) +GARBAGE += $(XPCOM_GLUE_SRC_LCPPSRCS) SRCS_IN_OBJDIR = 1 diff --git a/xpcom/glue/standalone/staticruntime/Makefile.in b/xpcom/glue/standalone/staticruntime/Makefile.in index 5016fb012b2b..0f21c15504db 100644 --- a/xpcom/glue/standalone/staticruntime/Makefile.in +++ b/xpcom/glue/standalone/staticruntime/Makefile.in @@ -63,7 +63,7 @@ USE_STATIC_LIBS = 1 # Don't use STL wrappers here (i.e. wrapped ); they require mozalloc STL_FLAGS = -GARBAGE += $(XPCOM_GLUE_SRC_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX)) +GARBAGE += $(XPCOM_GLUE_SRC_LCPPSRCS) SRCS_IN_OBJDIR = 1 diff --git a/xpcom/glue/staticruntime/Makefile.in b/xpcom/glue/staticruntime/Makefile.in index 61f2b637510d..edd5c3ddf867 100644 --- a/xpcom/glue/staticruntime/Makefile.in +++ b/xpcom/glue/staticruntime/Makefile.in @@ -32,7 +32,7 @@ SDK_LIBRARY = \ $(LIB_PREFIX)xpcomglue_staticruntime_s.$(LIB_SUFFIX) \ $(NULL) -GARBAGE += $(XPCOM_GLUE_SRC_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX)) +GARBAGE += $(XPCOM_GLUE_SRC_LCPPSRCS) FORCE_STATIC_LIB = 1