From 8d292a08dfb79ec9a55673eb570f1c5128cc47ec Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 24 Dec 2007 03:49:56 +0000 Subject: * Makefile.in, configure.in, lib/mkmf.rb, */Makefile.sub: specify compiled output file name explicitly. * enc/Makefile.in, enc/depend: now makes compiler to put generated files under directories corresnponding to the each source. enc/trans supported. * enc/make_encmake.rb: evaluates depend file before Makefile.in so that the former can influence to CONFIG. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- Makefile.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 32b698a0df..d4da5d62bd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -37,6 +37,7 @@ VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir):$(srcdir)/enc:$(srcdir)/mis empty = OUTFLAG = @OUTFLAG@$(empty) +COUTFLAG = @COUTFLAG@$(empty) CFLAGS = @CFLAGS@ @ARCH_FLAG@ XCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) @XCFLAGS@ CPPFLAGS = @CPPFLAGS@ @@ -182,13 +183,13 @@ lex.c: keywords fi .c.@OBJEXT@: - $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -c $< + $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $< .s.@OBJEXT@: $(AS) $(ASFLAGS) -o $@ $< .c.S: - $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -S $< + $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -S $< clean-local:: @$(RM) ext/extinit.c ext/extinit.$(OBJEXT) @@ -197,4 +198,4 @@ distclean-local:: @$(RM) ext/config.cache $(RBCONFIG) ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP) - $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(OUTFLAG)$@ -c ext/extinit.c + $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c -- cgit v1.2.3