From 55f3bc01cf3676f2d19d0d83c0c21d4db18540e3 Mon Sep 17 00:00:00 2001 From: "bsmedberg%covad.net" Date: Fri, 18 Jun 2004 00:56:48 +0000 Subject: [PATCH] Merge rules for building .m files from the aviary 1.0 branch. (original checkins by Ben Goodger and Brian Ryner) git-svn-id: svn://10.0.0.236/trunk@158075 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/config/rules.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mozilla/config/rules.mk b/mozilla/config/rules.mk index 35555956010..fee36840806 100644 --- a/mozilla/config/rules.mk +++ b/mozilla/config/rules.mk @@ -222,6 +222,7 @@ _OBJS = \ $(addsuffix .$(OBJ_SUFFIX), $(JMC_GEN)) \ $(CSRCS:.c=.$(OBJ_SUFFIX)) \ $(CPPSRCS:.cpp=.$(OBJ_SUFFIX)) \ + $(CMSRCS:.m=.$(OBJ_SUFFIX)) \ $(CMMSRCS:.mm=.$(OBJ_SUFFIX)) \ $(ASFILES:.$(ASM_SUFFIX)=.$(OBJ_SUFFIX)) OBJS = $(strip $(_OBJS)) @@ -1118,6 +1119,11 @@ $(OBJ_PREFIX)%.$(OBJ_SUFFIX): %.mm Makefile Makefile.in @$(MAKE_DEPS_AUTO) $(ELOG) $(CCC) -o $@ -c $(COMPILE_CXXFLAGS) $(_VPATH_SRCS) +$(OBJ_PREFIX)%.$(OBJ_SUFFIX): %.m Makefile Makefile.in + $(REPORT_BUILD) + @$(MAKE_DEPS_AUTO) + $(ELOG) $(CC) -o $@ -c $(COMPILE_CFLAGS) $(_VPATH_SRCS) + %.s: %.cpp $(CCC) -S $(COMPILE_CXXFLAGS) $(_VPATH_SRCS) @@ -1637,7 +1643,7 @@ endif # hundreds of built-in suffix rules for stuff we don't need. # .SUFFIXES: -.SUFFIXES: .out .a .ln .o .c .cc .C .cpp .y .l .s .S .h .sh .i .pl .class .java .html .pp .mk .in .$(OBJ_SUFFIX) .mm .idl $(BIN_SUFFIX) +.SUFFIXES: .out .a .ln .o .c .cc .C .cpp .y .l .s .S .h .sh .i .pl .class .java .html .pp .mk .in .$(OBJ_SUFFIX) .m .mm .idl $(BIN_SUFFIX) # # Fake targets. Always run these rules, even if a file/directory with that