Skip to content

Commit 98b6058

Browse files
committed
fix build make files
1 parent 55ac25d commit 98b6058

File tree

2 files changed

+61
-4
lines changed

2 files changed

+61
-4
lines changed

Mkfiles/msvc.mak

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ PROGS = nasm$(X) ndisasm$(X)
8989
# Files dependent on extracted warnings
9090
WARNOBJ = asm\warnings.obj
9191
WARNFILES = asm\warnings_c.h include\warnings.h doc\warnings.src
92+
WARNTIMES = asm\warnings_c.h.time include\warnings.h.time doc\warnings.src.time
9293

9394
OUTPUTOBJ = \
9495
output\outform.obj output\outlib.obj \
@@ -205,7 +206,7 @@ $(NDISLIB): $(LIBOBJ_DIS)
205206
$(AR) $(ARFLAGS) /out:$@ $**
206207

207208
# These are specific to certain Makefile syntaxes...
208-
WARNSRCS = $(LIBOBJ_NW:.c=.obj)
209+
WARNSRCS = $(ALLOBJ_W:.obj=.c)
209210

210211
#-- Begin Generated File Rules --#
211212
# Edit in Makefile.in, not here!
@@ -333,6 +334,34 @@ asm\directbl.c: asm\directiv.dat nasmlib\perfhash.pl perllib\phash.ph
333334
$(RUNPERL) $(srcdir)\nasmlib\perfhash.pl c \
334335
$(srcdir)\asm\directiv.dat asm\directbl.c
335336

337+
warnings: .SYMBOLIC
338+
$(RM_F) $(WARNFILES) $(WARNTIMES) asm\warnings.time
339+
%make asm\warnings.time
340+
341+
asm\warnings.time: $(WARNTIMES) asm\warnings.pl $(WARNSRCS)
342+
$(EMPTY) asm\warnings.time
343+
344+
asm\warnings_c.h.time: asm\warnings_c.h
345+
$(EMPTY) asm\warnings_c.h.time
346+
347+
asm\warnings_c.h: asm\warnings.pl $(WARNSRCS)
348+
$(RUNPERL) $(srcdir)\asm\warnings.pl c asm\warnings_c.h \
349+
$(srcdir) $(WARNSRCS)
350+
351+
include\warnings.h.time: include\warnings.h
352+
$(EMPTY) include\warnings.h.time
353+
354+
include\warnings.h: asm\warnings.pl $(WARNSRCS)
355+
$(RUNPERL) $(srcdir)\asm\warnings.pl h include\warnings.h \
356+
$(srcdir) $(WARNSRCS)
357+
358+
doc\warnings.src.time: doc\warnings.src
359+
$(EMPTY) doc\warnings.src.time
360+
361+
doc\warnings.src : asm\warnings.pl $(WARNSRCS)
362+
$(RUNPERL) $(srcdir)\asm\warnings.pl doc doc\warnings.src \
363+
$(srcdir) $(WARNSRCS)
364+
336365
# Editor token files
337366
editors\nasmtok.el: editors\nasmtok.pl asm\tokhash.c asm\pptok.c \
338367
asm\directiv.dat macros\macros.c editors\builtin.mac \

Mkfiles/openwcom.mak

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ RUNPERL = $(PERL) $(PERLFLAGS)
3333

3434
RM_F = -del /f
3535
LN_S = copy
36-
EMPTY = copy nul:
36+
EMPTY = %create
3737
SIDE = %null Created by side effect
3838

3939
MAKENSIS = makensis
@@ -74,6 +74,7 @@ PROGS = nasm$(X) ndisasm$(X)
7474
# Files dependent on extracted warnings
7575
WARNOBJ = asm\warnings.obj
7676
WARNFILES = asm\warnings_c.h include\warnings.h doc\warnings.src
77+
WARNTIMES = asm\warnings_c.h.time include\warnings.h.time doc\warnings.src.time
7778

7879
OUTPUTOBJ = &
7980
output\outform.obj output\outlib.obj &
@@ -213,8 +214,7 @@ ndisasm.lib: $(LIBOBJ_DIS)
213214

214215
# These are specific to certain Makefile syntaxes (what are they
215216
# actually supposed to look like for wmake?)
216-
WARNTIMES = $(WARNFILES:=.time)
217-
WARNSRCS = $(LIBOBJ_NW:.obj=.c)
217+
WARNSRCS = $(ALLOBJ_W:.obj=.c)
218218

219219
#-- Begin Generated File Rules --#
220220
# Edit in Makefile.in, not here!
@@ -357,6 +357,34 @@ editors: $(EDITORS)
357357

358358
#-- End Generated File Rules --#
359359

360+
warnings: .SYMBOLIC
361+
$(RM_F) $(WARNFILES) $(WARNTIMES) asm\warnings.time
362+
%make asm\warnings.time
363+
364+
asm\warnings.time: $(WARNTIMES) asm\warnings.pl $(WARNSRCS)
365+
$(EMPTY) asm\warnings.time
366+
367+
asm\warnings_c.h.time: asm\warnings_c.h
368+
$(EMPTY) asm\warnings_c.h.time
369+
370+
asm\warnings_c.h: asm\warnings.pl $(WARNSRCS)
371+
$(RUNPERL) $(srcdir)\asm\warnings.pl c asm\warnings_c.h &
372+
$(srcdir) $(WARNSRCS)
373+
374+
include\warnings.h.time: include\warnings.h
375+
$(EMPTY) include\warnings.h.time
376+
377+
include\warnings.h: asm\warnings.pl $(WARNSRCS)
378+
$(RUNPERL) $(srcdir)\asm\warnings.pl h include\warnings.h &
379+
$(srcdir) $(WARNSRCS)
380+
381+
doc\warnings.src.time: doc\warnings.src
382+
$(EMPTY) doc\warnings.src.time
383+
384+
doc\warnings.src : asm\warnings.pl $(WARNSRCS)
385+
$(RUNPERL) $(srcdir)\asm\warnings.pl doc doc\warnings.src &
386+
$(srcdir) $(WARNSRCS)
387+
360388
perlreq: $(PERLREQ) .SYMBOLIC
361389

362390
#-- Begin NSIS Rules --#

0 commit comments

Comments
 (0)