summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-07-13 13:54:47 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-07-13 13:54:47 -0700
commitcdc69da37cdd30c33144e955f513542b5d96ef47 (patch)
treedc1246a92399f2b4b93441c61f5df2abf782c7b7
parenta8ef7ab51d78d6096ee9bde58177800e5a2f3b4c (diff)
downloadnasm-cdc69da37cdd30c33144e955f513542b5d96ef47.tar.gz
nasm-cdc69da37cdd30c33144e955f513542b5d96ef47.tar.bz2
nasm-cdc69da37cdd30c33144e955f513542b5d96ef47.zip
version.mak for the version Makefile fragment
Be consistent about the naming of the version Makefile fragment. We use .mak elsewhere for Makefiles, so use that.
-rw-r--r--Makefile.in6
-rw-r--r--Mkfiles/netware.mak4
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in
index 557be2f..3cbb9bc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -108,8 +108,8 @@ version.mac: version version.pl
$(PERL) $(srcdir)/version.pl mac < $(srcdir)/version > version.mac
version.sed: version version.pl
$(PERL) $(srcdir)/version.pl sed < $(srcdir)/version > version.sed
-version.make: version version.pl
- $(PERL) $(srcdir)/version.pl make < $(srcdir)/version > version.make
+version.mak: version version.pl
+ $(PERL) $(srcdir)/version.pl make < $(srcdir)/version > version.mak
# This source file is generated from the standard macros file
# `standard.mac' by another Perl script. Again, it's part of the
@@ -157,7 +157,7 @@ pptok.ph: pptok.dat pptok.pl perllib/phash.ph
PERLREQ = macros.c insnsb.c insnsa.c insnsd.c insnsi.h insnsn.c \
regs.c regs.h regflags.c regdis.c regdis.h regvals.c \
tokhash.c tokens.h pptok.h pptok.c pptok.ph \
- version.h version.mac version.make
+ version.h version.mac version.mak
perlreq: $(PERLREQ)
install: nasm$(X) ndisasm$(X)
diff --git a/Mkfiles/netware.mak b/Mkfiles/netware.mak
index ce2ab4e..672221c 100644
--- a/Mkfiles/netware.mak
+++ b/Mkfiles/netware.mak
@@ -3,7 +3,7 @@
PROOT=.
OBJDIR=release
--include $(OBJDIR)/version.inc
+-include $(OBJDIR)/version.mak
TARGETS=nasm.nlm ndisasm.nlm
@@ -113,7 +113,7 @@ clean:
distclean: clean
-$(RM) $(TARGETS)
-$(OBJDIR)/version.inc: $(PROOT)/version $(PROOT)/version.pl $(OBJDIR)
+$(OBJDIR)/version.mak: $(PROOT)/version $(PROOT)/version.pl $(OBJDIR)
@$(PERL) $(PROOT)/version.pl make < $< > $@
#-- Magic hints to mkdep.pl --#