Reduce duplicate replacements
Reduce duplicate replacements so that reflect macros in command lines consitently. So that reflect macros in command lines. Others than `nmake` have no problems with nested expansions.
This commit is contained in:
parent
cc63718694
commit
11793f897c
@ -128,7 +128,7 @@ XDLDFLAGS = @DLDFLAGS@
|
|||||||
DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG)
|
DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG)
|
||||||
SOLIBS = @SOLIBS@
|
SOLIBS = @SOLIBS@
|
||||||
ENABLE_DEBUG_ENV = @ENABLE_DEBUG_ENV@
|
ENABLE_DEBUG_ENV = @ENABLE_DEBUG_ENV@
|
||||||
MAINLIBS = @YJIT_LIBS@ @MAINLIBS@
|
MAINLIBS = $(YJIT_LIBS) @MAINLIBS@
|
||||||
ARCHMINIOBJS = @MINIOBJS@
|
ARCHMINIOBJS = @MINIOBJS@
|
||||||
DLNOBJ = @DLNOBJ@
|
DLNOBJ = @DLNOBJ@
|
||||||
ENCOBJS = @ENCOBJS@
|
ENCOBJS = @ENCOBJS@
|
||||||
@ -166,7 +166,7 @@ XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@
|
|||||||
BOOTSTRAPRUBY = @BOOTSTRAPRUBY@
|
BOOTSTRAPRUBY = @BOOTSTRAPRUBY@
|
||||||
|
|
||||||
COROUTINE_H = @X_COROUTINE_H@
|
COROUTINE_H = @X_COROUTINE_H@
|
||||||
COROUTINE_OBJ = $(COROUTINE_H:.h=.@OBJEXT@)
|
COROUTINE_OBJ = $(COROUTINE_H:.h=.$(OBJEXT))
|
||||||
COROUTINE_SRC = @X_COROUTINE_SRC@
|
COROUTINE_SRC = @X_COROUTINE_SRC@
|
||||||
|
|
||||||
#### End of system configuration section. ####
|
#### End of system configuration section. ####
|
||||||
@ -253,7 +253,7 @@ MINIPRELUDE_C = miniprelude.c
|
|||||||
GOLF_PRELUDE_C= golf_prelude.c
|
GOLF_PRELUDE_C= golf_prelude.c
|
||||||
RBCONFIG = .rbconfig.time
|
RBCONFIG = .rbconfig.time
|
||||||
|
|
||||||
MAINSRC = $(MAINOBJ:.@OBJEXT@=.c)
|
MAINSRC = $(MAINOBJ:.$(OBJEXT)=.c)
|
||||||
|
|
||||||
SRC_FILE = $<
|
SRC_FILE = $<
|
||||||
OS_SRC_FILE = $<
|
OS_SRC_FILE = $<
|
||||||
@ -446,11 +446,11 @@ $(srcdir)/enc/jis/props.h: enc/jis/props.kwd
|
|||||||
$(CP) $@ $(?:.kwd=.h.blt); \
|
$(CP) $@ $(?:.kwd=.h.blt); \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
.c.@OBJEXT@:
|
.c.$(OBJEXT):
|
||||||
@$(ECHO) compiling $<
|
@$(ECHO) compiling $<
|
||||||
$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $<
|
$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $<
|
||||||
|
|
||||||
.$(ASMEXT).@OBJEXT@:
|
.$(ASMEXT).$(OBJEXT):
|
||||||
@$(ECHO) assembling $<
|
@$(ECHO) assembling $<
|
||||||
$(Q) $(CC) $(ASFLAGS) -DSYMBOL_PREFIX=$(SYMBOL_PREFIX) -o $@ -c $<
|
$(Q) $(CC) $(ASFLAGS) -DSYMBOL_PREFIX=$(SYMBOL_PREFIX) -o $@ -c $<
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user