mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	Merge Nakada's patch and define StringValuePtr for ruby-1.6.
CV ---------------------------------------------------------------------- git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2330 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
		
							parent
							
								
									493c57f65a
								
							
						
					
					
						commit
						74b4c81396
					
				
					 10 changed files with 180 additions and 167 deletions
				
			
		| 
						 | 
				
			
			@ -1,16 +1,17 @@
 | 
			
		|||
CLEANFILES = test/test.o
 | 
			
		||||
DISTCLEANFILES = call.func callback.func cbtable.func dlconfig.rb dlconfig.h \
 | 
			
		||||
                 test/libtest.so test/*~ *~ mkmf.log
 | 
			
		||||
LDSHARED_TEST = $(LDSHARED) $(LDFLAGS) test/test.o -o test/libtest.so $(LOCAL_LIBS)
 | 
			
		||||
 | 
			
		||||
libtest.so: test/libtest.so
 | 
			
		||||
 | 
			
		||||
test/libtest.so: test/test.o test/libtest.def
 | 
			
		||||
	$(RUBY) -rftools -e 'ARGV.each{|d|File.mkpath(File.dirname(d))}' $@
 | 
			
		||||
	`$(RUBY) -e 'print ARGV.join(" ").gsub(/dl\\.def/,"test/libtest.def")' $(LDSHARED)` $(LDFLAGS) test/test.o -o test/libtest.so
 | 
			
		||||
	$(LDSHARED_TEST:dl.def=test/libtest.def)
 | 
			
		||||
 | 
			
		||||
test/test.o: test/test.c
 | 
			
		||||
test/test.o: $(srcdir)/test/test.c
 | 
			
		||||
	@$(RUBY) -rftools -e 'File.mkpath(*ARGV)' test
 | 
			
		||||
	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
 | 
			
		||||
	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/test/test.c -o $@
 | 
			
		||||
 | 
			
		||||
test:: dl.so libtest.so .force
 | 
			
		||||
	$(RUBY) -I. -I$(srcdir)/lib $(srcdir)/test/test.rb
 | 
			
		||||
| 
						 | 
				
			
			@ -22,23 +23,23 @@ test:: dl.so libtest.so .force
 | 
			
		|||
allclean: distclean
 | 
			
		||||
	@rm -f $(CLEANFILES) $(DISTCLEANFILES)
 | 
			
		||||
 | 
			
		||||
$(OBJS): dlconfig.h
 | 
			
		||||
$(OBJS): ./dlconfig.h
 | 
			
		||||
 | 
			
		||||
sym.o: call.func
 | 
			
		||||
 | 
			
		||||
dl.o: callback.func cbtable.func
 | 
			
		||||
 | 
			
		||||
call.func: mkcall.rb dlconfig.rb
 | 
			
		||||
call.func: $(srcdir)/mkcall.rb ./dlconfig.rb
 | 
			
		||||
	@echo "Generating call.func"
 | 
			
		||||
	@$(RUBY) $< > $@
 | 
			
		||||
	@$(RUBY) $(srcdir)/mkcall.rb > $@
 | 
			
		||||
 | 
			
		||||
callback.func: mkcallback.rb dlconfig.rb
 | 
			
		||||
callback.func: $(srcdir)/mkcallback.rb ./dlconfig.rb
 | 
			
		||||
	@echo "Generating callback.func"
 | 
			
		||||
	@$(RUBY) $< > $@
 | 
			
		||||
	@$(RUBY) $(srcdir)/mkcallback.rb > $@
 | 
			
		||||
 | 
			
		||||
cbtable.func: mkcbtable.rb dlconfig.rb
 | 
			
		||||
cbtable.func: $(srcdir)/mkcbtable.rb ./dlconfig.rb
 | 
			
		||||
	@echo "Generating cbtable.func"
 | 
			
		||||
	@$(RUBY) $< > $@
 | 
			
		||||
	@$(RUBY) $(srcdir)/mkcbtable.rb > $@
 | 
			
		||||
 | 
			
		||||
debug:
 | 
			
		||||
	$(MAKE) CPPFLAGS="$(CPPFLAGS) -DDEBUG"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue