diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-05-28 15:52:57 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-05-30 12:03:57 +0900 |
| commit | 11793f897ce40e833d69d5cd76c13e08a611bcd9 (patch) | |
| tree | 2444b6f8b3e02f8c9966017af3a2649278480c4b /template | |
| parent | cc6371869402ed1e1ef13d51bf1f9409378111e9 (diff) | |
| download | ruby-11793f897ce40e833d69d5cd76c13e08a611bcd9.tar.gz | |
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.
Diffstat (limited to 'template')
| -rw-r--r-- | template/Makefile.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/template/Makefile.in b/template/Makefile.in index 12d23e1fa9..e55f466efc 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -128,7 +128,7 @@ XDLDFLAGS = @DLDFLAGS@ DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) SOLIBS = @SOLIBS@ ENABLE_DEBUG_ENV = @ENABLE_DEBUG_ENV@ -MAINLIBS = @YJIT_LIBS@ @MAINLIBS@ +MAINLIBS = $(YJIT_LIBS) @MAINLIBS@ ARCHMINIOBJS = @MINIOBJS@ DLNOBJ = @DLNOBJ@ ENCOBJS = @ENCOBJS@ @@ -166,7 +166,7 @@ XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@ BOOTSTRAPRUBY = @BOOTSTRAPRUBY@ COROUTINE_H = @X_COROUTINE_H@ -COROUTINE_OBJ = $(COROUTINE_H:.h=.@OBJEXT@) +COROUTINE_OBJ = $(COROUTINE_H:.h=.$(OBJEXT)) COROUTINE_SRC = @X_COROUTINE_SRC@ #### End of system configuration section. #### @@ -253,7 +253,7 @@ MINIPRELUDE_C = miniprelude.c GOLF_PRELUDE_C= golf_prelude.c RBCONFIG = .rbconfig.time -MAINSRC = $(MAINOBJ:.@OBJEXT@=.c) +MAINSRC = $(MAINOBJ:.$(OBJEXT)=.c) SRC_FILE = $< OS_SRC_FILE = $< @@ -446,11 +446,11 @@ $(srcdir)/enc/jis/props.h: enc/jis/props.kwd $(CP) $@ $(?:.kwd=.h.blt); \ fi -.c.@OBJEXT@: +.c.$(OBJEXT): @$(ECHO) compiling $< $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $< -.$(ASMEXT).@OBJEXT@: +.$(ASMEXT).$(OBJEXT): @$(ECHO) assembling $< $(Q) $(CC) $(ASFLAGS) -DSYMBOL_PREFIX=$(SYMBOL_PREFIX) -o $@ -c $< |