Module: wine Branch: master Commit: 49dc686ae99a630460cfafcbfbbed8f43280610b URL: http://source.winehq.org/git/wine.git/?a=commit;h=49dc686ae99a630460cfafcbfb...
Author: Ken Thomases ken@codeweavers.com Date: Thu Dec 20 19:02:24 2012 -0600
makefiles: Allow use of Objective-C source files in modules.
---
Make.rules.in | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Make.rules.in b/Make.rules.in index 7c4a65c..38231a8 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -2,6 +2,7 @@ # # Each individual makefile may define the following variables: # C_SRCS : C sources for the module +# OBJC_SRCS : Objective-C sources for the module # RC_SRCS : resource source files # EXTRA_SRCS : extra source files for make depend # EXTRA_OBJS : extra object files @@ -29,7 +30,7 @@ CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $ $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) \ $(PO_SRCS:%=rsrc.pot) $(MC_SRCS:%=msg.pot) $(XTEMPLATE_SRCS:.x=.h)
-OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) \ +OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(OBJC_SRCS:.m=.o) \ $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_RES) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS)
CROSSOBJS = $(OBJS:.o=.cross.o) @@ -47,6 +48,9 @@ filter: dummy .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $<
+.m.o: + $(CC) -c $(ALLCFLAGS) -o $@ $< + .c.cross.o: $(CROSSCC) -c $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) -o $@ $<
@@ -137,7 +141,7 @@ winapi_check:: dummy
# Rules for dependencies
-DEPEND_SRCS = $(C_SRCS) $(RC_SRCS) $(MC_SRCS) \ +DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) \ $(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS) $(IDL_P_SRCS) $(IDL_S_SRCS) \ $(IDL_GEN_C_SRCS) $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_SRCS) $(IDL_TLB_SRCS:.idl=.tlb) \ $(BISON_SRCS) $(LEX_SRCS) $(EXTRA_SRCS)