summaryrefslogtreecommitdiff
path: root/bcc32
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-09-08 09:08:15 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-09-08 09:08:15 +0000
commit4f26f3b8902a59ec27070f8cf1fd038561894f4d (patch)
tree8f51964341539072b73e7d7ffdae95c6179cca9e /bcc32
parent275d1a12e6eeae346731bd9373aeff934d270db0 (diff)
* configure.in: modify program_prefix only if specified
--program-prefix. * configure.in: don't generate ext/extmk.rb. * Makefile.in: execute directly $(srcdir)/ext/extmk.rb. remove -Cext option, "Dir::chdir 'ext'" in ext/extmk.rb. * {win32,bccwin32}/Makefile.sub: ditto. * instruby.rb: ditto. * ext/extmk.rb: renamed from ext/extmk.rb.in. * lib/mkmf.rb (module Logging): create log files (mkmf.log) in each extension module directories. * ext/extmk.rb: ditto. * lib/mkmf.rb (macro_defined?): new method. * ext/.cvsignore: remove extmk.rb. * ext/*/.cvsignore: add "*.def". git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'bcc32')
-rw-r--r--bcc32/Makefile.sub24
1 files changed, 12 insertions, 12 deletions
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 31b9236..1bdb70b 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -165,9 +165,9 @@ OBJS = array.obj \
version.obj \
$(MISSING)
-all: miniruby$(EXEEXT) rbconfig.rb ext/extmk.rb \
+all: miniruby$(EXEEXT) rbconfig.rb \
$(LIBRUBY) $(MISCLIBS)
- @.\miniruby$(EXEEXT) -Cext extmk.rb
+ @.\miniruby$(EXEEXT) $(srcdir)ext/extmk.rb
ruby: $(PROGRAM)
rubyw: $(WPROGRAM)
@@ -324,6 +324,7 @@ s,@DLEXT2@,dll,;t t
s,@STRIP@,$(STRIP),;t t
s,@EXTSTATIC@,$(EXTSTATIC),;t t
s,@setup@,Setup,;t t
+s,@MINIRUBY@,$(MINIRUBY),;t t
s,@LIBRUBY_LDSHARED@,$(LIBRUBY_LDSHARED),;t t
s,@LIBRUBY_DLDFLAGS@,$(LIBRUBY_DLDFLAGS),;t t
s,@RUBY_INSTALL_NAME@,$(RUBY_INSTALL_NAME),;t t
@@ -345,13 +346,13 @@ s,@srcdir@,$(srcdir),;t t
s,@top_srcdir@,$(srcdir),;t t
|
-ext/extmk.rb: $(srcdir)ext/extmk.rb.in config.status
- @echo Creating ext/extmk.rb
- @.\miniruby$(EXEEXT) $(srcdir)ext/configsub.rb \
- -srcdir=$(srcdir) \
- -install_name=$(RUBY_INSTALL_NAME) \
- -so_name=$(RUBY_SO_NAME) \
- -output=$@ $(srcdir)ext/extmk.rb.in
+#ext/extmk.rb: $(srcdir)ext/extmk.rb.in config.status
+# @echo Creating ext/extmk.rb
+# @.\miniruby$(EXEEXT) $(srcdir)ext/configsub.rb \
+# -srcdir=$(srcdir) \
+# -install_name=$(RUBY_INSTALL_NAME) \
+# -so_name=$(RUBY_SO_NAME) \
+# -output=$@ $(srcdir)ext/extmk.rb.in
miniruby$(EXEEXT): $(OBJS) $(MAINOBJ) $(EXTOBJS)
@echo $(EXTOBJS)
@@ -396,13 +397,12 @@ clean-local:
@if exist *.tds del *.tds
clean-ext:
- @-.\miniruby$(EXEEXT) -Cext extmk.rb clean
+ @-.\miniruby$(EXEEXT) $(srcdir)ext/extmk.rb clean
distclean: distclean-ext distclean-local
distclean-local: clean-local
@if exist Makefile del Makefile
- @if exist ext\extmk.rb del ext\extmk.rb
@if exist config.h del config.h
@if exist ext\config.cache del ext\config.cache
@if exist config.cache del config.cache
@@ -432,7 +432,7 @@ distclean-local: clean-local
@if exist miniruby$(EXEEXT) del miniruby$(EXEEXT)
distclean-ext:
- @-.\miniruby$(EXEEXT) -Cext extmk.rb distclean
+ @-.\miniruby$(EXEEXT) $(srcdir)ext/extmk.rb distclean
realclean: distclean
@if exist parse.c del parse.c