rogue4: don't include config.h if it wasn't created.

This commit is contained in:
John "Elwin" Edwards 2013-09-09 07:58:47 -04:00
parent ea75e2ac0b
commit 0f998b01ad
2 changed files with 8 additions and 5 deletions

View file

@ -51,6 +51,7 @@ CFILES= vers.c extern.c armor.c chase.c command.c daemon.c daemons.c \
MISC= Makefile LICENSE.TXT rogue.6 rogue.me MISC= Makefile LICENSE.TXT rogue.6 rogue.me
CFLAGS= -O3 CFLAGS= -O3
CPPFLAGS=@DEFS@
CRLIB = -lcurses CRLIB = -lcurses
RM = rm -f RM = rm -f
TAR = tar TAR = tar
@ -67,8 +68,8 @@ NL=
MACHDEP= MACHDEP=
.c.o: .c.o:
@echo $(CC) -c $(CFLAGS) $*.c @echo $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c
@$(CC) -c $(CFLAGS) $*.c -o $*.o @$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c -o $*.o
# @cpp -P $(CFLAGS) $*.c | ./xstr -v -c - # @cpp -P $(CFLAGS) $*.c | ./xstr -v -c -
# @cc -c $(CFLAGS) x.c # @cc -c $(CFLAGS) x.c
# @mv x.o $*.o # @mv x.o $*.o
@ -79,13 +80,13 @@ MACHDEP=
$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $@ $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
main.o: main.c $(HDRS) main.o: main.c $(HDRS)
$(CC) -c $(CFLAGS) -o $@ main.c $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ main.c
vers.o: vers.o:
$(CC) -c $(CFLAGS) vers.c $(CC) -c $(CPPFLAGS) $(CFLAGS) vers.c
mach_dep.o: mach_dep.c mach_dep.o: mach_dep.c
$(CC) -c $(CFLAGS) $(SF) $(NL) $(MACHDEP) mach_dep.c $(CC) -c $(CPPFLAGS) $(CFLAGS) $(SF) $(NL) $(MACHDEP) mach_dep.c
xs.o: strings xs.o: strings
./xstr ./xstr

View file

@ -479,7 +479,9 @@ THING *find_mons(), *find_obj(), *get_item(), *new_item(),
struct room *roomin(); struct room *roomin();
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "extern.h" #include "extern.h"
#ifndef PATH_MAX #ifndef PATH_MAX