comparison modules/common/Makefile.common @ 5923:61d7d7bcbe76 cygwin

merged heads after pull -u
author Henry Thompson <ht@markup.co.uk>
date Thu, 05 Feb 2015 17:19:05 +0000
parents 080c1762f7a1
children
comparison
equal deleted inserted replaced
5921:68639fb08af8 5923:61d7d7bcbe76
33 33
34 SHELL=/bin/sh 34 SHELL=/bin/sh
35 RM=rm -f 35 RM=rm -f
36 PROGNAME=@PROGNAME@ 36 PROGNAME=@PROGNAME@
37 CFLAGS=@XE_CFLAGS@ 37 CFLAGS=@XE_CFLAGS@
38 CPPFLAGS=@CPPFLAGS@
38 INSTALL=@INSTALL@ 39 INSTALL=@INSTALL@
39 version=@version@ 40 version=@version@
40 prefix=@prefix@ 41 prefix=@prefix@
41 exec_prefix=@exec_prefix@ 42 exec_prefix=@exec_prefix@
42 libdir=@libdir@ 43 libdir=@libdir@
65 66
66 .PHONY: install 67 .PHONY: install
67 all: $(OBJECT_TO_BUILD) 68 all: $(OBJECT_TO_BUILD)
68 69
69 .c.o: 70 .c.o:
70 $(MODCC) $(MODCFLAGS) -c $< 71 $(MODCC) $(MODCFLAGS) $(CPPFLAGS) -c $<
71 72
72 $(MODNAME).ell: $(OBJS) $(MODNAME)_i.o $(IMPORT_LIB) 73 $(MODNAME).ell: $(OBJS) $(MODNAME)_i.o $(IMPORT_LIB)
73 $(MODCC) --mode=link --mode=verbose --mod-output=$@ \ 74 $(MODCC) --mode=link --mode=verbose --mod-output=$@ \
74 $(OBJS) $(MODNAME)_i.o $(IMPORT_LIB) $(LDFLAGS) $(LIBSTDCPP) 75 $(OBJS) $(MODNAME)_i.o $(IMPORT_LIB) $(LDFLAGS) $(LIBSTDCPP)
75 76