Makefiles: don't rely on built-in implicit rules.
Not all make implementations will use CPPFLAGS when compiling C files.
This commit is contained in:
parent
fece552183
commit
e30aa0e491
7 changed files with 24 additions and 5 deletions
|
|
@ -58,11 +58,14 @@ CRLIB = @LIBS@
|
||||||
RM = rm -f
|
RM = rm -f
|
||||||
TAR = tar
|
TAR = tar
|
||||||
INSTALL=@INSTALL@
|
INSTALL=@INSTALL@
|
||||||
.SUFFIXES: .obj
|
.SUFFIXES: .obj .o .c
|
||||||
|
|
||||||
.c.obj:
|
.c.obj:
|
||||||
$(CC) $(CFLAGS) /c $*.c
|
$(CC) $(CFLAGS) /c $*.c
|
||||||
|
|
||||||
|
.c.o:
|
||||||
|
$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c
|
||||||
|
|
||||||
$(PROGRAM): $(OBJS)
|
$(PROGRAM): $(OBJS)
|
||||||
$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(CRLIB) -o $@
|
$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(CRLIB) -o $@
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -74,11 +74,14 @@ NROFF=@NROFF@
|
||||||
COLCRT=@COLCRT@
|
COLCRT=@COLCRT@
|
||||||
TBL=@TBL@
|
TBL=@TBL@
|
||||||
|
|
||||||
.SUFFIXES: .obj
|
.SUFFIXES: .obj .o .c
|
||||||
|
|
||||||
.c.obj:
|
.c.obj:
|
||||||
$(CC) $(CFLAGS) /c $*.c
|
$(CC) $(CFLAGS) /c $*.c
|
||||||
|
|
||||||
|
.c.o:
|
||||||
|
$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c
|
||||||
|
|
||||||
all: $(PROGRAM) docs
|
all: $(PROGRAM) docs
|
||||||
|
|
||||||
$(PROGRAM): $(HDRS) $(OBJS)
|
$(PROGRAM): $(HDRS) $(OBJS)
|
||||||
|
|
|
||||||
|
|
@ -68,11 +68,14 @@ NROFF=@NROFF@
|
||||||
COLCRT=@COLCRT@
|
COLCRT=@COLCRT@
|
||||||
TBL=@TBL@
|
TBL=@TBL@
|
||||||
|
|
||||||
.SUFFIXES: .obj
|
.SUFFIXES: .obj .o .c
|
||||||
|
|
||||||
.c.obj:
|
.c.obj:
|
||||||
$(CC) $(CFLAGS) /c $*.c
|
$(CC) $(CFLAGS) /c $*.c
|
||||||
|
|
||||||
|
.c.o:
|
||||||
|
$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $*.o $*.c
|
||||||
|
|
||||||
all: $(PROGRAM)$(EXE) docs
|
all: $(PROGRAM)$(EXE) docs
|
||||||
|
|
||||||
$(PROGRAM)$(EXE): $(HDRS) $(OBJS)
|
$(PROGRAM)$(EXE): $(HDRS) $(OBJS)
|
||||||
|
|
|
||||||
|
|
@ -68,6 +68,8 @@ NL=
|
||||||
#MACHDEP= -DMAXLOAD=40 -DLOADAV -DCHECKTIME=4
|
#MACHDEP= -DMAXLOAD=40 -DLOADAV -DCHECKTIME=4
|
||||||
MACHDEP=
|
MACHDEP=
|
||||||
|
|
||||||
|
.SUFFIXES: .c .o
|
||||||
|
|
||||||
.c.o:
|
.c.o:
|
||||||
@echo $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c
|
@echo $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c
|
||||||
@$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c -o $*.o
|
@$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c -o $*.o
|
||||||
|
|
|
||||||
|
|
@ -123,7 +123,7 @@ AFILES = configure Makefile.in configure.ac config.h.in config.sub config.gues
|
||||||
MISC = Makefile.std LICENSE.TXT rogue54.sln rogue54.vcproj rogue.spec \
|
MISC = Makefile.std LICENSE.TXT rogue54.sln rogue54.vcproj rogue.spec \
|
||||||
rogue.png rogue.desktop
|
rogue.png rogue.desktop
|
||||||
|
|
||||||
.SUFFIXES: .obj
|
.SUFFIXES: .obj .o .c
|
||||||
|
|
||||||
.c.obj:
|
.c.obj:
|
||||||
$(CC) $(CFLAGS) $(CPPFLAGS) /c $*.c
|
$(CC) $(CFLAGS) $(CPPFLAGS) /c $*.c
|
||||||
|
|
|
||||||
|
|
@ -59,6 +59,11 @@ all: $(PROGRAM) docs
|
||||||
$(PROGRAM): $(HDRS) $(OBJS)
|
$(PROGRAM): $(HDRS) $(OBJS)
|
||||||
$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(CRLIB) -o $@
|
$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(CRLIB) -o $@
|
||||||
|
|
||||||
|
.SUFFIXES: .c .o
|
||||||
|
|
||||||
|
.c.o:
|
||||||
|
$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c
|
||||||
|
|
||||||
tags: $(HDRS) $(CFILES)
|
tags: $(HDRS) $(CFILES)
|
||||||
ctags -u $?
|
ctags -u $?
|
||||||
ed - tags < :ctfix
|
ed - tags < :ctfix
|
||||||
|
|
|
||||||
|
|
@ -57,11 +57,14 @@ LIBS = @LIBS@
|
||||||
RM = rm -f
|
RM = rm -f
|
||||||
TAR = tar
|
TAR = tar
|
||||||
INSTALL=@INSTALL@
|
INSTALL=@INSTALL@
|
||||||
.SUFFIXES: .obj
|
.SUFFIXES: .obj .o .c
|
||||||
|
|
||||||
.c.obj:
|
.c.obj:
|
||||||
$(CC) $(CFLAGS) /c $*.c
|
$(CC) $(CFLAGS) /c $*.c
|
||||||
|
|
||||||
|
.c.o:
|
||||||
|
$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c
|
||||||
|
|
||||||
$(PROGRAM): $(HDRS) $(OBJS)
|
$(PROGRAM): $(HDRS) $(OBJS)
|
||||||
$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
|
$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue