mirror of
https://github.com/netwide-assembler/nasm.git
synced 2025-03-31 18:20:22 +08:00
Unbreak building in a separate object directory
Fix bitrot in building in a separate object directory. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
parent
cba1aca466
commit
b06736ae7e
@ -22,7 +22,7 @@ INTERNAL_CFLAGS = -I$(srcdir) -I.
|
||||
ALL_CFLAGS = $(BUILD_CFLAGS) $(INTERNAL_CFLAGS)
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBS = @LIBS@
|
||||
PERL = perl -I$(srcdir)/perllib
|
||||
PERL = perl -I$(srcdir)/perllib -I$(srcdir)
|
||||
|
||||
XOBJS = @XOBJS@
|
||||
|
||||
@ -113,7 +113,7 @@ ndisasm$(X): $(NDISASM) $(XOBJS)
|
||||
# instruction-table file by a Perl script. They're distributed,
|
||||
# though, so it isn't necessary to have Perl just to recompile NASM
|
||||
# from the distribution.
|
||||
INSDEP = insns.dat insns.pl insns-iflags.pl
|
||||
INSDEP = insns.dat insns.pl
|
||||
|
||||
iflag.c: $(INSDEP)
|
||||
$(PERL) $(srcdir)/insns.pl -fc $(srcdir)/insns.dat
|
||||
|
@ -33,7 +33,7 @@ INTERNAL_CFLAGS = /I$(srcdir) /I. \
|
||||
ALL_CFLAGS = $(BUILD_CFLAGS) $(INTERNAL_CFLAGS)
|
||||
LDFLAGS = $(LDFLAGS) /SUBSYSTEM:CONSOLE
|
||||
LIBS =
|
||||
PERL = perl -I$(srcdir)/perllib
|
||||
PERL = perl -I$(srcdir)/perllib -I$(srcdir)
|
||||
|
||||
# Binary suffixes
|
||||
O = obj
|
||||
|
@ -22,7 +22,7 @@ LD = *wlink
|
||||
LDEBUG =
|
||||
LDFLAGS = op quiet $(%TARGET_LFLAGS) $(LDEBUG)
|
||||
LIBS =
|
||||
PERL = perl -I$(srcdir)/perllib
|
||||
PERL = perl -I$(srcdir)/perllib -I$(srcdir)
|
||||
|
||||
STRIP = wstrip
|
||||
|
||||
|
@ -37,7 +37,7 @@ ALL_CFLAGS = $(BUILD_CFLAGS) $(INTERNAL_CFLAGS)
|
||||
LD = $(CC)
|
||||
LDFLAGS = $(ALL_CFLAGS)
|
||||
LIBS =
|
||||
PERL = perl -I$(srcdir)/perllib
|
||||
PERL = perl -I$(srcdir)/perllib -I$(srcdir)
|
||||
|
||||
STRIP = wstrip
|
||||
|
||||
|
@ -204,5 +204,5 @@ PA_ADD_CFLAGS([-Werror=missing-declarations])
|
||||
PA_ADD_CFLAGS([-Werror=comment])
|
||||
PA_ADD_CFLAGS([-Werror=vla])])
|
||||
|
||||
AC_OUTPUT_COMMANDS([mkdir -p output])
|
||||
AC_OUTPUT_COMMANDS([mkdir -p lib nsis output])
|
||||
AC_OUTPUT(Makefile rdoff/Makefile doc/Makefile)
|
||||
|
@ -19,7 +19,7 @@ datarootdir = @datarootdir@
|
||||
CC = @CC@
|
||||
CFLAGS = @CFLAGS@
|
||||
BUILD_CFLAGS = $(CFLAGS) @DEFS@
|
||||
INTERNAL_CFLAGS = -I$(srcdir) -I$(top_srcdir)
|
||||
INTERNAL_CFLAGS = -I$(srcdir) -I$(top_srcdir) -I..
|
||||
ALL_CFLAGS = $(BUILD_CFLAGS) $(INTERNAL_CFLAGS)
|
||||
LDFLAGS = @LDFLAGS@
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user