aniani/nasm
0
0
Fork 1
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-11-08 23:27:15 -05:00
Code Activity

Makefile: include $(PROGOBJ) in $(DIRS) dependency

Browse Source 
The $(DIRS) dependency didn't include $(PROGOBJ), which could cause
Make to try to build asm/nasm.o or disasm/ndisasm.o before the
corresponding object subdirectory had been created.

Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin (Intel)
2025-10-15 20:00:36 -07:00
parent efe066ef40
commit fc56538bce
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.in
View File

@@ -224,7 +224,7 @@ ZLIBOBJ = \
LIBOBJ = $(LIBOBJ_W) $(LIBOBJ_NW) $(ZLIB)
ALLOBJ_W = $(NASM) $(LIBOBJ_W)
ALLOBJ = $(PROGOBJ) $(LIBOBJ)
ALLOBJ = $(PROGOBJ) $(LIBOBJ) $(LIBOBJ_DIS)
SUBDIRS = stdlib nasmlib include config output asm disasm x86 \
common zlib macros misc
XSUBDIRS = nsis win test doc editors
@@ -262,7 +262,7 @@ ndisasm$(X): $(NDISASM) $(MANIFEST) $(DISLIB) $(NASMLIB)
$(DISLIB) $(NASMLIB) $(LIBS)
# Make sure we have subdirectories set up...
$(LIBOBJ) $(LIBOBJ_DIS): $(DIRS)
$(ALLOBJ): $(DIRS)
#-- Begin Generated File Rules --#

2
Mkfiles/msvc.mak
View File

@@ -175,7 +175,7 @@ ZLIBOBJ = \
LIBOBJ = $(LIBOBJ_W) $(LIBOBJ_NW) $(ZLIB)
ALLOBJ_W = $(NASM) $(LIBOBJ_W)
ALLOBJ = $(PROGOBJ) $(LIBOBJ)
ALLOBJ = $(PROGOBJ) $(LIBOBJ) $(LIBOBJ_DIS)
SUBDIRS = stdlib nasmlib include config output asm disasm x86 \
common zlib macros misc
XSUBDIRS = nsis win test doc editors

2
Mkfiles/openwcom.mak
View File

@@ -161,7 +161,7 @@ ZLIBOBJ = &
LIBOBJ = $(LIBOBJ_W) $(LIBOBJ_NW) $(ZLIB)
ALLOBJ_W = $(NASM) $(LIBOBJ_W)
ALLOBJ = $(PROGOBJ) $(LIBOBJ)
ALLOBJ = $(PROGOBJ) $(LIBOBJ) $(LIBOBJ_DIS)
SUBDIRS = stdlib nasmlib include config output asm disasm x86 &
common zlib macros misc
XSUBDIRS = nsis win test doc editors