diff options
| author | hpa <hpa> | 2002-04-29 18:54:58 +0000 |
|---|---|---|
| committer | hpa <hpa> | 2002-04-29 18:54:58 +0000 |
| commit | e7bbfebb4832e0e2c334b54859b2133b19a90b77 (patch) | |
| tree | f6a4ecd0ca4767bc8003912eda5f270c88677b0d | |
| parent | c7a2a0e5d371c21e1c3ae89c3fe6166cdbf4b13a (diff) | |
| download | syslinux-e7bbfebb4832e0e2c334b54859b2133b19a90b77.tar.gz syslinux-e7bbfebb4832e0e2c334b54859b2133b19a90b77.tar.xz syslinux-e7bbfebb4832e0e2c334b54859b2133b19a90b77.zip | |
Rename generated include files from *.inc -> *.gen to avoid Makefile
confusion
| -rw-r--r-- | Makefile | 18 | ||||
| -rw-r--r-- | genstupid.pl | 4 | ||||
| -rw-r--r-- | keywords.inc | 2 | ||||
| -rw-r--r-- | syslinux.asm | 2 |
4 files changed, 13 insertions, 13 deletions
@@ -79,21 +79,21 @@ samples: memdisk: $(MAKE) -C memdisk all -kwdhash.inc: keywords genhash.pl - $(PERL) genhash.pl < keywords > kwdhash.inc +kwdhash.gen: keywords genhash.pl + $(PERL) genhash.pl < keywords > kwdhash.gen -ldlinux.bin: ldlinux.asm kwdhash.inc +ldlinux.bin: ldlinux.asm kwdhash.gen $(NASM) -f bin -dVERSION="'$(VERSION)'" -dDATE_STR="'$(DATE)'" \ -dHEXDATE="$(HEXDATE)" \ -l ldlinux.lst -o ldlinux.bin ldlinux.asm $(PERL) genstupid.pl < ldlinux.lst -pxelinux.bin: pxelinux.asm kwdhash.inc +pxelinux.bin: pxelinux.asm kwdhash.gen $(NASM) -f bin -dVERSION="'$(VERSION)'" -dDATE_STR="'$(DATE)'" \ -dHEXDATE="$(HEXDATE)" \ -l pxelinux.lst -o pxelinux.bin pxelinux.asm -isolinux.bin: isolinux.asm kwdhash.inc +isolinux.bin: isolinux.asm kwdhash.gen $(NASM) -f bin -dVERSION="'$(VERSION)'" -dDATE_STR="'$(DATE)'" \ -dHEXDATE="$(HEXDATE)" \ -l isolinux.lst -o isolinux.bin isolinux.asm @@ -102,7 +102,7 @@ pxelinux.0: pxelinux.bin cp pxelinux.bin pxelinux.0 # Special verbose version of isolinux.bin -isolinux-debug.bin: isolinux-debug.asm kwdhash.inc +isolinux-debug.bin: isolinux-debug.asm kwdhash.gen $(NASM) -f bin -dVERSION="'$(VERSION)'" -dDATE_STR="'$(DATE)'" \ -dHEXDATE="$(HEXDATE)" \ -l isolinux-debug.lst -o isolinux-debug.bin isolinux-debug.asm @@ -116,7 +116,7 @@ ldlinux.sys: ldlinux.bin mbr.bin: mbr.asm $(NASM) -f bin -l mbr.lst -o mbr.bin mbr.asm -syslinux.com: syslinux.asm ldlinux.bss ldlinux.sys stupid.inc +syslinux.com: syslinux.asm ldlinux.bss ldlinux.sys stupid.gen $(NASM) -f bin -l syslinux.lst -o syslinux.com syslinux.asm copybs.com: copybs.asm @@ -138,7 +138,7 @@ ldlinux.lst: ldlinux.bin stupid.c: ldlinux.lst genstupid.pl $(PERL) genstupid.pl < ldlinux.lst -stupid.inc: stupid.c +stupid.gen: stupid.c : Generated by side effect stupid.o: stupid.c @@ -153,7 +153,7 @@ install: installer install -m 644 -c $(INSTALL_LIB) $(INSTALLROOT)$(LIBDIR) local-tidy: - rm -f *.o *_bin.c stupid.* + rm -f *.o *_bin.c stupid.* *.gen rm -f syslinux.lst copybs.lst pxelinux.lst isolinux*.lst rm -f $(OBSOLETE) diff --git a/genstupid.pl b/genstupid.pl index 2001268e..9adf8ef4 100644 --- a/genstupid.pl +++ b/genstupid.pl @@ -1,7 +1,7 @@ #ident "$Id$" ## ----------------------------------------------------------------------- ## -## Copyright 1998 H. Peter Anvin - All Rights Reserved +## Copyright 1998-2002 H. Peter Anvin - All Rights Reserved ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -58,7 +58,7 @@ print CFILE "}\n"; close(CFILE); -open(ASMFILE, "> stupid.inc") || die "$0: cannot open stupid.inc: $!\n"; +open(ASMFILE, "> stupid.gen") || die "$0: cannot open stupid.inc: $!\n"; printf ASMFILE "\tsection .text\n"; printf ASMFILE "make_stupid:\n"; diff --git a/keywords.inc b/keywords.inc index ddab5dd0..51551ef0 100644 --- a/keywords.inc +++ b/keywords.inc @@ -18,7 +18,7 @@ ;; %ifndef DEPEND ; Generated file -%include "kwdhash.inc" +%include "kwdhash.gen" %endif %macro keyword 2 diff --git a/syslinux.asm b/syslinux.asm index d0af292d..ba23d20d 100644 --- a/syslinux.asm +++ b/syslinux.asm @@ -444,7 +444,7 @@ die_common: ; in case we give the -s (stupid) option ; %ifndef DEPEND ; Generated file -%include "stupid.inc" +%include "stupid.gen" %endif section .data |