diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1998-11-26 08:25:51 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1998-11-26 08:25:51 +0000 |
| commit | 11187ce939d94c3a2f6d9239114c2696a8271834 (patch) | |
| tree | cfa74a6ea96d9652aae8da349eec2da41b2aca64 /ext | |
| parent | 8271cacad706ed0d7741889faebb0c19270b8370 (diff) | |
1.1c9 - 1.1c final, hopefully
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@345 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/Setup | 2 | ||||
| -rw-r--r-- | ext/extmk.rb.in | 15 | ||||
| -rw-r--r-- | ext/md5/md5init.c | 4 | ||||
| -rw-r--r-- | ext/tk/MANIFEST | 3 |
4 files changed, 15 insertions, 9 deletions
@@ -7,7 +7,7 @@ #fcntl #kconv #md5 -socket +#socket #tkutil #tcltklib #gtk diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index dbb453df60..b60951538d 100644 --- a/ext/extmk.rb.in +++ b/ext/extmk.rb.in @@ -304,7 +304,7 @@ archdir = $(pkglibdir)/@arch@ mfile.printf "OBJS = " if !$objs then $objs = [] - for f in Dir["#{$top_srcdir}/ext/#{target}/*.{c,cc}"] + for f in Dir["#{$top_srcdir}/ext/#{$mdir}/*.{c,cc}"] f = File.basename(f) f.sub!(/\.(c|cc)$/, ".o") $objs.push f @@ -323,7 +323,7 @@ binsuffix = @binsuffix@ all: $(TARGET) -clean:; @rm -f *.o *.so *.sl +clean:; @rm -f *.o *.a *.so *.sl @rm -f Makefile extconf.h conftest.* @rm -f core ruby$(binsuffix) *~ @@ -350,7 +350,7 @@ install: mfile.printf "\ $(TARGET): $(OBJS) @AR@ cru $(TARGET) $(OBJS) - @-@RANLIB@ $(LIBRUBY) 2> /dev/null || true + @-@RANLIB@ $(TARGET) 2> /dev/null || true " elsif "@DLEXT@" != "o" mfile.printf "\ @@ -416,8 +416,9 @@ def extmake(target) $LDFLAGS = nil begin - system "mkdir " + target unless File.directory?(target) + system "mkdir", target unless File.directory?(target) Dir.chdir target + $mdir = target if $static_ext.size > 0 || !File.exist?("./Makefile") || older("./Makefile", "#{$top_srcdir}/ext/@setup@") || @@ -541,7 +542,11 @@ if $extlist.size > 0 `rm -f ruby@binsuffix@` end - $extobjs = "ext/extinit.o " + $extobjs + if $extobjs + $extobjs = "ext/extinit.o " + $extobjs + else + $extobjs = "ext/extinit.o " + end if PLATFORM =~ /m68k-human|beos/ $extlibs.gsub!("-L/usr/local/lib", "") if $extlibs end diff --git a/ext/md5/md5init.c b/ext/md5/md5init.c index 65fd996ca9..ab29935c41 100644 --- a/ext/md5/md5init.c +++ b/ext/md5/md5init.c @@ -53,7 +53,7 @@ md5_clone(obj) MD5_CTX *md5, *md5_new; Data_Get_Struct(obj, MD5_CTX, md5); - obj = Data_Make_Struct(CLASS_OF(obj), MD5_CTX, 0, 0, md5_new); + obj = Data_Make_Struct(CLASS_OF(obj), MD5_CTX, 0, free, md5_new); *md5_new = *md5; return obj; @@ -72,7 +72,7 @@ md5_new(argc, argv, class) rb_scan_args(argc, argv, "01", &arg); if (!NIL_P(arg)) Check_Type(arg, T_STRING); - obj = Data_Make_Struct(class, MD5_CTX, 0, 0, md5); + obj = Data_Make_Struct(class, MD5_CTX, 0, free, md5); MD5Init(md5); if (!NIL_P(arg)) { md5_update(obj, arg); diff --git a/ext/tk/MANIFEST b/ext/tk/MANIFEST index 5096f900c7..9689186bf0 100644 --- a/ext/tk/MANIFEST +++ b/ext/tk/MANIFEST @@ -1,6 +1,7 @@ MANIFEST -tkutil.c +extconf.rb depend +tkutil.c lib/tk.rb lib/tkafter.rb lib/tkbgerror.rb |