← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/ruby1.9/intrepid-updates

« back to all changes in this revision

Viewing changes to win32/setup.mak

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2007-09-04 16:01:17 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20070904160117-i15zckg2nhxe9fyw
Tags: 1.9.0+20070830-2ubuntu1
* Sync from Debian; remaining changes:
  - Add -g to CFLAGS.
* Fixes build failure on ia64.
* Fixes build failure with gcc-4.2 on lpia.
* Robustify check for target_os, fixing build failure on lpia.
* Set Ubuntu maintainer address.

Show diffs side-by-side

added added

removed removed

Lines of Context:
win32/setup.mak
12
12
!ifndef prefix
13
13
prefix = /usr
14
14
!endif
 
15
!if "$(OS)" != "mswin64"
15
16
OS = mswin32
 
17
!endif
16
18
BANG = !
17
19
APPEND = echo>>$(MAKEFILE)
18
20
!ifdef MAKEFILE
26
28
CPP = $(CC) -EP
27
29
 
28
30
all: -prologue- -generic- -epilogue-
29
 
i386-$(OS): -prologue- -i386- -epilogue-
30
 
i486-$(OS): -prologue- -i486- -epilogue-
31
 
i586-$(OS): -prologue- -i586- -epilogue-
32
 
i686-$(OS): -prologue- -i686- -epilogue-
33
 
alpha-$(OS): -prologue- -alpha- -epilogue-
 
31
i386-mswin32: -prologue- -i386- -epilogue-
 
32
i486-mswin32: -prologue- -i486- -epilogue-
 
33
i586-mswin32: -prologue- -i586- -epilogue-
 
34
i686-mswin32: -prologue- -i686- -epilogue-
 
35
alpha-mswin32: -prologue- -alpha- -epilogue-
 
36
x64-mswin64: -prologue64- -x64- -epilogue-
 
37
ia64-mswin64: -prologue64- -ia64- -epilogue-
34
38
 
35
39
-prologue-: -basic-vars- -system-vars- -version- -program-name-
36
40
 
 
41
-prologue64-: -basic-vars- -system-vars64- -version- -program-name-
 
42
 
37
43
-basic-vars-: nul
38
44
        @type << > $(MAKEFILE)
39
45
### Makefile for ruby $(OS) ###
54
60
 
55
61
-system-vars-: -osname- -runtime-
56
62
 
 
63
-system-vars64-: -osname64- -runtime-
 
64
 
57
65
-osname-: nul
58
66
        @echo OS = mswin32 >>$(MAKEFILE)
59
67
 
 
68
-osname64-: nul
 
69
        @echo OS = mswin64 >>$(MAKEFILE)
 
70
 
60
71
-runtime-: nul
61
72
        @$(CC) -MD <<rtname.c user32.lib > nul
62
73
#include <windows.h>
115
126
        @del rtname.*
116
127
 
117
128
-version-: nul
118
 
        @$(CPP) -I$(srcdir) -DRUBY_EXTERN="//" <<"Creating $(MAKEFILE)" >>$(MAKEFILE)
 
129
        @$(CPP) -I$(srcdir) <<"Creating $(MAKEFILE)" >>$(MAKEFILE)
119
130
#include "version.h"
120
131
MAJOR = RUBY_VERSION_MAJOR
121
132
MINOR = RUBY_VERSION_MINOR
151
162
 
152
163
-alpha-: nul
153
164
        @$(APPEND) $(ARCH) = alpha
 
165
-x64-: nul
 
166
        @$(APPEND) $(ARCH) = x64
 
167
-ia64-: nul
 
168
        @$(APPEND) $(ARCH) = ia64
154
169
-ix86-: nul
155
170
        @$(APPEND) $(ARCH) = x86
156
171