fix build make files

Author: jmalak

Mkfiles/msvc.mak

@@ -333,6 +333,34 @@ asm\directbl.c: asm\directiv.dat nasmlib\perfhash.pl perllib\phash.ph
 	$(RUNPERL) $(srcdir)\nasmlib\perfhash.pl c \
 		$(srcdir)\asm\directiv.dat asm\directbl.c
 
+warnings: .SYMBOLIC
+    $(RM_F) $(WARNFILES) $(WARNTIMES) asm\warnings.time
+    %make asm\warnings.time
+
+asm\warnings.time: $(WARNTIMES) asm\warnings.pl $(WARNSRCS)
+    $(EMPTY) asm\warnings.time
+
+asm\warnings_c.h.time: asm\warnings_c.h
+    $(EMPTY) asm\warnings_c.h.time
+
+asm\warnings_c.h: asm\warnings.pl $(WARNSRCS)
+    $(RUNPERL) $(srcdir)\asm\warnings.pl c asm\warnings_c.h &
+                $(srcdir) $(WARNSRCS)
+
+include\warnings.h.time: include\warnings.h
+    $(EMPTY) include\warnings.h.time
+
+include\warnings.h: asm\warnings.pl $(WARNSRCS)
+    $(RUNPERL) $(srcdir)\asm\warnings.pl h include\warnings.h &
+        $(srcdir) $(WARNSRCS)
+
+doc\warnings.src.time: doc\warnings.src
+    $(EMPTY) doc\warnings.src.time
+
+doc\warnings.src : asm\warnings.pl $(WARNSRCS)
+    $(RUNPERL) $(srcdir)\asm\warnings.pl doc doc\warnings.src &
+        $(srcdir) $(WARNSRCS)
+
 # Editor token files
 editors\nasmtok.el: editors\nasmtok.pl asm\tokhash.c asm\pptok.c \
 		 asm\directiv.dat macros\macros.c editors\builtin.mac \

Mkfiles/openwcom.mak

@@ -33,7 +33,7 @@ RUNPERL         = $(PERL) $(PERLFLAGS)
 
 RM_F		= -del /f
 LN_S		= copy
-EMPTY		= copy nul:
+EMPTY		= %create
 SIDE		= %null Created by side effect
 
 MAKENSIS        = makensis
@@ -74,6 +74,7 @@ PROGS   = nasm$(X) ndisasm$(X)
 # Files dependent on extracted warnings
 WARNOBJ   = asm\warnings.obj
 WARNFILES = asm\warnings_c.h include\warnings.h doc\warnings.src
+WARNTIMES = asm\warnings_c.h.time include\warnings.h.time doc\warnings.src.time
 
 OUTPUTOBJ = &
 	output\outform.obj output\outlib.obj &
@@ -213,8 +214,7 @@ ndisasm.lib: $(LIBOBJ_DIS)
 
 # These are specific to certain Makefile syntaxes (what are they
 # actually supposed to look like for wmake?)
-WARNTIMES = $(WARNFILES:=.time)
-WARNSRCS  = $(LIBOBJ_NW:.obj=.c)
+WARNSRCS  = $(ALLOBJ_W:.obj=.c)
 
 #-- Begin Generated File Rules --#
 # Edit in Makefile.in, not here!
@@ -357,6 +357,34 @@ editors: $(EDITORS)
 
 #-- End Generated File Rules --#
 
+warnings: .SYMBOLIC
+    $(RM_F) $(WARNFILES) $(WARNTIMES) asm\warnings.time
+    %make asm\warnings.time
+
+asm\warnings.time: $(WARNTIMES) asm\warnings.pl $(WARNSRCS)
+    $(EMPTY) asm\warnings.time
+
+asm\warnings_c.h.time: asm\warnings_c.h
+    $(EMPTY) asm\warnings_c.h.time
+
+asm\warnings_c.h: asm\warnings.pl $(WARNSRCS)
+    $(RUNPERL) $(srcdir)\asm\warnings.pl c asm\warnings_c.h &
+                $(srcdir) $(WARNSRCS)
+
+include\warnings.h.time: include\warnings.h
+    $(EMPTY) include\warnings.h.time
+
+include\warnings.h: asm\warnings.pl $(WARNSRCS)
+    $(RUNPERL) $(srcdir)\asm\warnings.pl h include\warnings.h &
+        $(srcdir) $(WARNSRCS)
+
+doc\warnings.src.time: doc\warnings.src
+    $(EMPTY) doc\warnings.src.time
+
+doc\warnings.src : asm\warnings.pl $(WARNSRCS)
+    $(RUNPERL) $(srcdir)\asm\warnings.pl doc doc\warnings.src &
+        $(srcdir) $(WARNSRCS)
+
 perlreq: $(PERLREQ) .SYMBOLIC
 
 #-- Begin NSIS Rules --#

asm/warnings.pl

@@ -57,6 +57,7 @@ ($$)
     my $this;
     my @doc;
 
+print STDERR "F-$infile\n";
     while (defined(my $l = <$in>)) {
 	$nline++;
 	chomp $l;
@@ -65,6 +66,7 @@ ($$)
 	    $l =~ s/^.*?\/\*.*?\*\///g; # Remove single-line comments
 
 	    if ($l =~ /^.*?(\/\*.*)$/) {
+print STDERR "1-$l\n";
 		# Begin block comment
 		$l = $1;
 		$in_comment = 1;
@@ -73,10 +75,12 @@ ($$)
 
 	if ($in_comment) {
 	    if ($l =~ /\*\//) {
+print STDERR "3-$l\n";
 		# End block comment
 		$in_comment = 0;
 		undef $this;
 	    } elsif ($l =~ /^\s*\/?\*\!(\-|\=|\s*)(.*?)\s*$/) {
+print STDERR "2a-$l\n";
 		my $opr = $1;
 		my $str = $2;
 
@@ -106,18 +110,22 @@ ($$)
 			$nwarn++;
 		    }
 		} elsif ($opr eq '=') {
+print STDERR "2b-$l\n";
 		    # Alias names for warnings
 		    for my $a (split(/,+/, $str)) {
 			add_alias($a, $this);
 		    }
 		} elsif ($opr =~ /^[\-\s]/) {
+print STDERR "2c-$l\n";
 		    push(@{$this->{doc}}, "$str\n");
 		} else {
+print STDERR "2d-$l\n";
 		    print STDERR "$infile:$nline: malformed warning definition\n";
 		    print STDERR "    $l\n";
 		    $err++;
 		}
 	    } else {
+#print STDERR "2e-$l\n";
 		undef $this;
 	    }
 	}
@@ -146,7 +154,9 @@ sub sort_warnings {
 
 @warnings = sort sort_warnings @warnings;
 my @warn_noall = @warnings;
+if (@warnings) {
 pop @warn_noall if ($warn_noall[$#warn_noall]->{name} eq 'all');
+}
 
 my $outdata;
 open(my $out, '>', \$outdata)