From 8b218e7c33f5cfaba2e9292a46d3bdd919efff30 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 10 Jun 2007 03:06:15 +0000
Subject: * include/ruby: moved public headers.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@12501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/ripper/depend     | 8 ++++----
 ext/ripper/extconf.rb | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'ext/ripper')

diff --git a/ext/ripper/depend b/ext/ripper/depend
index bd0f8010c..f74f7f0fe 100644
--- a/ext/ripper/depend
+++ b/ext/ripper/depend
@@ -1,11 +1,11 @@
 GEN  = $(srcdir)/tools/generate.rb
-SRC1 = $(hdrdir)/parse.y
+SRC1 = $(top_srcdir)/parse.y
 SRC2 = $(srcdir)/eventids2.c
 BISON = bison
 
 src: ripper.c eventids1.c eventids2table.c
 
-ripper.o: ripper.c $(topdir)/lex.c eventids1.c $(srcdir)/eventids2.c eventids2table.c
+ripper.o: ripper.c lex.c eventids1.c eventids2.c eventids2table.c
 
 .y.c:
 	$(BISON) -t -v -o$@ $<
@@ -13,8 +13,8 @@ ripper.o: ripper.c $(topdir)/lex.c eventids1.c $(srcdir)/eventids2.c eventids2ta
 all: check
 static: check
 
-ripper.y: $(srcdir)/tools/preproc.rb $(hdrdir)/parse.y
-	$(RUBY) $(srcdir)/tools/preproc.rb $(hdrdir)/parse.y --output=$@
+ripper.y: $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y
+	$(RUBY) $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y --output=$@
 
 check: $(GEN) $(SRC1) $(SRC2)
 	$(RUBY) $(GEN) --mode=check --ids1src=$(SRC1) --ids2src=$(SRC2)
diff --git a/ext/ripper/extconf.rb b/ext/ripper/extconf.rb
index 6b4407330..a41a6af2d 100644
--- a/ext/ripper/extconf.rb
+++ b/ext/ripper/extconf.rb
@@ -12,8 +12,10 @@ def main
   end
   $objs = %w(ripper.o)
   $cleanfiles.concat %w(ripper.y ripper.c ripper.E ripper.output eventids1.c eventids2table.c)
-  $CPPFLAGS += ' -DRIPPER'
-  $CPPFLAGS += ' -DRIPPER_DEBUG' if $debug
+  $defs << '-DRIPPER'
+  $defs << '-DRIPPER_DEBUG' if $debug
+  $VPATH << '$(topdir)' << '$(top_srcdir)'
+  $INCFLAGS << ' -I$(topdir) -I$(top_srcdir)'
   create_makefile 'ripper'
 end
 
-- 
cgit