diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-07-21 08:48:29 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-07-21 08:48:29 +0000 |
| commit | 2840fa6b6504de820c3ca40457306787545d27fe (patch) | |
| tree | c1b027de2d2a1a4a79e608ac8db25001fba8abde /bcc32 | |
| parent | 92cad4305b1751fcea0bcfe1386e8f8cba265167 (diff) | |
* common.mk: inverted rules order.
* thread_win32.ci (w32_create_thread): bcc does not have
_beginthreadex().
* bcc32/Makefile.sub: headers have moved.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12832 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'bcc32')
| -rw-r--r-- | bcc32/Makefile.sub | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 567050972c..915b16015e 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -11,6 +11,8 @@ OS = bccwin32 !error RT not defined. Retry from configure pass. !endif +arch = $(ARCH)-$(OS) + ## variables may be overridden by $(compile_dir)/Makefile !ifndef srcdir srcdir = .. @@ -40,7 +42,6 @@ iconinc=-I$(icondirs: = -I) !endif ############### -VPATH = $(srcdir):$(srcdir)/missing .SUFFIXES: .y !ifndef CC @@ -146,7 +147,7 @@ MISSING = acosh.obj crypt.obj erf.obj strlcat.obj strlcpy.obj win32.obj STACK = 0x2000000 !endif -XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)/missing +XCFLAGS = -DRUBY_EXPORT -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(srcdir)/missing ARFLAGS = /a /p32 LD = ilink32 -q -Gn @@ -187,8 +188,15 @@ INSTALLED_LIST= .installed.list WINMAINOBJ = winmain.$(OBJEXT) MINIOBJS = dmydln.$(OBJEXT) +arch_hdrdir = $(EXTOUT)/include/$(arch) +hdrdir = $(srcdir)/include +VPATH = $(arch_hdrdir)/ruby;$(hdrdir)/ruby;$(srcdir);$(srcdir)/missing;$(srcdir)/win32 + .path.c = .;$(srcdir);$(srcdir)/win32;$(srcdir)/missing -.path.h = .;$(srcdir);$(srcdir)/win32;$(srcdir)/missing +.path.ci = $(srcdir) +.path.inc = .;$(srcdir) +.path.def = .;$(srcdir) +.path.h = .;$(arch_hdrdir)/ruby;$(hdrdir)/ruby;$(srcdir);$(srcdir)/win32;$(srcdir)/missing .path.y = $(srcdir) .path. = $(srcdir) @@ -221,6 +229,7 @@ PHONY: nul @exit | +RUBY_CONFIG_H = $(arch_hdrdir)/ruby/config.h CONFIG_H = ./.config.h.time config: config.status @@ -228,7 +237,9 @@ config: config.status config.status: $(CONFIG_H) $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub - @$(srcdir:/=\)\win32\ifchange.bat config.h &&| + @if not exist $(arch_hdrdir:/=\) md $(arch_hdrdir:/=\) + @if not exist $(arch_hdrdir:/=\)\ruby md $(arch_hdrdir:/=\)\ruby + @$(srcdir:/=\)\win32\ifchange.bat $(RUBY_CONFIG_H:/=\) &&| \#define HAVE_SYS_TYPES_H 1 \#define HAVE_SYS_STAT_H 1 \#define HAVE_STDLIB_H 1 @@ -311,7 +322,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub \#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)" \#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)" | - @exit > $@ + @exit > $(@:/=\) config.status: $(MKFILES) $(srcdir)/bcc32/Makefile.sub $(srcdir)/common.mk @echo Creating $@ @@ -464,6 +475,9 @@ $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb -so_name=$(RUBY_SO_NAME) \ . $(icondirs) $(srcdir)/win32 +lex.c: {$(srcdir)}lex.c.blt + copy "$(?:/=\)" $@ + post-install-bin:: @$(NULLCMD) post-install-lib:: |