diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-23 05:32:01 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-23 05:32:01 +0000 |
| commit | 52a67fe60d08eb982586695b8bd6b1ceb32b30da (patch) | |
| tree | f646169c2368463a264425eae104519995a29a98 /bcc32 | |
| parent | 69d80a31202da7ab038f3ced858fc064e75d43f6 (diff) | |
* Makefile.in, */Makefile.sub, common.mk (clean-local, distclean-local):
separate files under directories due to directory separator.
* */Makefile.sub (MKFILES): common.mk and */Makefile.sub should not be
removed.
* win32/Makefile.sub, wince/Makefile.sub: $* cannot appear in explicit
rules.
* cygwin/GNUmakefile.in: some mingw stuffs were missed.
* lib/mkmf.rb (create_makefile): Borland make wrongly removes braces
from command lines.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6001 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'bcc32')
| -rw-r--r-- | bcc32/Makefile.sub | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 2ca5ea0c3d..c579ac9ed2 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -1,7 +1,7 @@ # -*- makefile -*- SHELL = $(COMSPEC) -MKFILES = Makefile $(srcdir)bcc32/Makefile.sub $(srcdir)common.mk +MKFILES = Makefile #### Start of system configuration section. #### OS = bccwin32 @@ -186,7 +186,7 @@ WINMAINOBJ = winmain.$(OBJEXT) sed -e "s!^ *extern char \*getenv();!/* & */!;s/^\(#.*\)y\.tab/\1parse/" y.tab.c > $(@F) @del y.tab.c -all: +all: $(srcdir)bcc32/Makefile.sub $(srcdir)common.mk !include $(srcdir)/common.mk @@ -271,11 +271,12 @@ config.h: \#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)" | -config.status: $(MKFILES) +config.status: $(MKFILES) $(srcdir)bcc32/Makefile.sub $(srcdir)common.mk @echo Creating $@ @type > $@ &&| # Generated automatically by Makefile.sub. s,@SHELL@,$$(COMSPEC),;t t +s,@PATH_SEPARATOR@,;,;t t s,@CFLAGS@,$(CFLAGS),;t t s,@CPPFLAGS@,$(CPPFLAGS),;t t s,@CXXFLAGS@,$(CXXFLAGS),;t t @@ -403,8 +404,15 @@ $(LIBRUBY): $(LIBRUBY_SO) $(RUBYDEF): $(LIBRUBY_A) $(PREP) $(MINIRUBY) $(srcdir)win32/mkexports.rb -output=$@ -base=$(RUBY_SO_NAME) $(LIBRUBY_A) +$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb + @$(MINIRUBY) $(srcdir)win32/resource.rb \ + -ruby_name=$(RUBY_INSTALL_NAME) \ + -rubyw_name=$(RUBYW_INSTALL_NAME) \ + -so_name=$(RUBY_SO_NAME) \ + . $(icondirs) $(srcdir)win32 + clean-local:: - @$(RM) ext\extinit.c ext\extinit.$(OBJEXT) *.tds *.il? + @$(RM) ext\extinit.c ext\extinit.$(OBJEXT) *.tds *.il? $(RUBY_SO_NAME).lib @$(RM) $(RUBY_INSTALL_NAME).res $(RUBYW_INSTALL_NAME).res $(RUBY_SO_NAME).res distclean-local:: |