Changed make to $(MAKE). Not sure if this is still needed, since MSYS has make.exe (in lieu of MinGW). Lots of demo makefiles still have make in them...

This commit is contained in:
skarg
2010-11-30 18:04:27 +00:00
parent a39bf392bd
commit f26997a367
3 changed files with 9 additions and 4 deletions
+1 -1
View File
@@ -1,10 +1,10 @@
@echo off
echo Build with MinGW and MSYS: mingw.sourceforge.net
rem set PATH=C:\MinGW\msys\1.0\bin;C:\MinGW\bin
rem assumes rm, cp, size are already in path
set CC=gcc
set AR=ar
set MAKE=make
set SIZE=size
make BACNET_PORT=win32 BUILD=release clean all
rem Build for MinGW debug
+1 -1
View File
@@ -22,7 +22,7 @@ ${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
lib: ${BACNET_LIB_TARGET}
${BACNET_LIB_TARGET}:
( cd ${BACNET_LIB_DIR} ; make clean ; make )
( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) )
.c.o:
${CC} -c ${CFLAGS} $*.c -o $@
+7 -2
View File
@@ -3,6 +3,11 @@
# tools - only if you need them.
# Most platforms have this already defined
# CC = gcc
# AR = ar
# MAKE = make
# SIZE = size
#
# Assumes rm and cp are available
# Executable file name
TARGET = bacrp
@@ -23,7 +28,7 @@ ${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
lib: ${BACNET_LIB_TARGET}
${BACNET_LIB_TARGET}:
( cd ${BACNET_LIB_DIR} ; make clean ; make )
( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) )
.c.o:
${CC} -c ${CFLAGS} $*.c -o $@
@@ -33,6 +38,6 @@ depend:
${CC} -MM ${CFLAGS} *.c >> .depend
clean:
rm -f core ${TARGET_BIN} ${OBJS} ${BACNET_LIB_TARGET}
rm -rf core ${TARGET_BIN} ${OBJS} ${BACNET_LIB_TARGET}
include: .depend