noisytoot/notnotdnethack
1
0
Fork 0
mirror of https://codeberg.org/noisytoot/notnotdnethack.git synced 2025-05-17 04:55:05 +01:00
Code Issues Activity

Fixes for parallel compilation

Browse source
This commit is contained in:
Edoardo Spadolini 2015-02-18 09:57:17 +01:00
parent eba93c43c4
commit d84b987462
1 changed files with 20 additions and 29 deletions

49
sys/unix/Makefile.utl
View file

@ -106,15 +106,6 @@ OBJDIR = ../src
YACC = bison -y
# YACC = byacc
LEX = flex
# these are the names of the output files from YACC/LEX. Under MS-DOS
# and similar systems, they may differ
YTABC = y.tab.c
YTABH = y.tab.h
LEXYYC = lex.yy.c
# YTABC = y_tab.c
# YTABH = y_tab.h
# LEXYYC = lexyy.c
@ -136,13 +127,13 @@ UTILSRCS = $(MAKESRC) panic.c $(SPLEVSRC) $(DGNCOMPSRC) $(RECOVSRC) $(DLBSRC)
# files that define all monsters and objects
CMONOBJ = ../src/monst.c ../src/objects.c
OMONOBJ = $(OBJDIR)/monst.o $(OBJDIR)/objects.o
OMONOBJ = $(OBJDIR)/monst_util.o $(OBJDIR)/objects_util.o
# files that provide access to NetHack's names
CNAMING = ../src/drawing.c ../src/decl.c $(CMONOBJ)
ONAMING = $(OBJDIR)/drawing.o $(OBJDIR)/decl.o $(OMONOBJ)
ONAMING = $(OBJDIR)/drawing_util.o $(OBJDIR)/decl_util.o $(OMONOBJ)
# dynamic memory allocation
CALLOC = ../src/alloc.c panic.c
OALLOC = $(OBJDIR)/alloc.o panic.o
OALLOC = $(OBJDIR)/alloc_util.o panic.o
# object files for makedefs
MAKEOBJS = makedefs.o $(OMONOBJ)
@ -157,7 +148,7 @@ DGNCOMPOBJS = dgn_yacc.o dgn_lex.o dgn_main.o $(OALLOC)
RECOVOBJS = recover.o
# object files for the data librarian
DLBOBJS = dlb_main.o $(OBJDIR)/dlb.o $(OALLOC)
DLBOBJS = dlb_main.o $(OBJDIR)/dlb_util.o $(OALLOC)
# flags for creating distribution versions of sys/share/*_lex.c, using
# a more portable flex skeleton, which is not included in the distribution.
@ -226,13 +217,13 @@ lev_lex.o: lev_lex.c $(HACK_H) ../include/lev_comp.h ../include/sp_lev.h
../include/lev_comp.h: lev_yacc.c
lev_yacc.c: lev_comp.y
$(YACC) $(YACCDIST) -d lev_comp.y
mv $(YTABC) lev_yacc.c
mv $(YTABH) ../include/lev_comp.h
$(YACC) $(YACCDIST) -b lev -d lev_comp.y
mv lev.tab.c lev_yacc.c
mv lev.tab.h ../include/lev_comp.h
lev_lex.c: lev_comp.l
$(LEX) $(FLEXDIST) lev_comp.l
mv $(LEXYYC) lev_lex.c
$(LEX) $(FLEXDIST) -t lev_comp.l > lev_lex.yy.c
mv lev_lex.yy.c lev_lex.c
# with all of extern.h's functions to complain about, we drown in
# 'defined but not used' without -u
@ -257,13 +248,13 @@ dgn_lex.o: dgn_lex.c $(CONFIG.H) ../include/dgn_comp.h ../include/dgn_file.h
../include/dgn_comp.h: dgn_yacc.c
dgn_yacc.c: dgn_comp.y
$(YACC) $(YACCDIST) -d dgn_comp.y
mv $(YTABC) dgn_yacc.c
mv $(YTABH) ../include/dgn_comp.h
$(YACC) $(YACCDIST) -b dgn -d dgn_comp.y
mv dgn.tab.c dgn_yacc.c
mv dgn.tab.h ../include/dgn_comp.h
dgn_lex.c: dgn_comp.l
$(LEX) $(FLEXDIST) dgn_comp.l
mv $(LEXYYC) dgn_lex.c
$(LEX) $(FLEXDIST) -t dgn_comp.l > dgn_lex.yy.c
mv dgn_lex.yy.c dgn_lex.c
# with all of extern.h's functions to complain about, we drown in
# 'defined but not used' without -u
@ -366,17 +357,17 @@ tile2beos.o: ../win/BeOS/tile2beos.cpp $(HACK_H) ../include/tile.h
# make sure object files from src are available when needed
#
$(OBJDIR)/alloc.o: ../src/alloc.c $(CONFIG_H)
$(OBJDIR)/alloc_util.o: ../src/alloc.c $(CONFIG_H)
$(CC) $(CFLAGS) -c ../src/alloc.c -o $@
$(OBJDIR)/drawing.o: ../src/drawing.c $(CONFIG_H)
$(OBJDIR)/drawing_util.o: ../src/drawing.c $(CONFIG_H)
$(CC) $(CFLAGS) -c ../src/drawing.c -o $@
$(OBJDIR)/decl.o: ../src/decl.c $(CONFIG_H)
$(OBJDIR)/decl_util.o: ../src/decl.c $(CONFIG_H)
$(CC) $(CFLAGS) -c ../src/decl.c -o $@
$(OBJDIR)/monst.o: ../src/monst.c $(CONFIG_H)
$(OBJDIR)/monst_util.o: ../src/monst.c $(CONFIG_H)
$(CC) $(CFLAGS) -c ../src/monst.c -o $@
$(OBJDIR)/objects.o: ../src/objects.c $(CONFIG_H)
$(OBJDIR)/objects_util.o: ../src/objects.c $(CONFIG_H)
$(CC) $(CFLAGS) -c ../src/objects.c -o $@
$(OBJDIR)/dlb.o: ../src/dlb.c $(HACK_H) ../include/dlb.h
$(OBJDIR)/dlb_util.o: ../src/dlb.c $(HACK_H) ../include/dlb.h
$(CC) $(CFLAGS) -c ../src/dlb.c -o $@
# make sure hack.h dependencies get transitive information