From 7343b492a20fccc753e77845a1c18bede5b070f8 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 14 Apr 2016 01:30:12 +0000 Subject: [PATCH] ruby-runner.h * template/ruby-runner.h.in: separate configured part from ruby-runner.c. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54572 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- .gitignore | 2 +- Makefile.in | 6 +++--- template/ruby-runner.c.in => ruby-runner.c | 4 +--- template/ruby-runner.h.in | 3 +++ 4 files changed, 8 insertions(+), 7 deletions(-) rename template/ruby-runner.c.in => ruby-runner.c (87%) create mode 100644 template/ruby-runner.h.in diff --git a/.gitignore b/.gitignore index 80c12594dd..320ccc2dc5 100644 --- a/.gitignore +++ b/.gitignore @@ -103,7 +103,7 @@ y.tab.c /rubicon /ruby /ruby-runner -/ruby-runner.c +/ruby-runner.h /ruby-man.rd.gz /sizes.c /test.rb diff --git a/Makefile.in b/Makefile.in index 1db6bd81ea..60fb44fd90 100644 --- a/Makefile.in +++ b/Makefile.in @@ -254,11 +254,11 @@ ruby_pc = @ruby_pc@ $(ruby_pc): @./config.status --file=$@:$(srcdir)/template/ruby.pc.in -ruby-runner.c: template/ruby-runner.c.in +ruby-runner.h: template/ruby-runner.h.in @./config.status --file=$@:$(srcdir)/template/$(@F).in -ruby-runner$(EXEEXT): ruby-runner.c - $(Q) $(PURIFY) $(CC) $(CFLAGS) $(CPPFLAGS) -DRUBY_INSTALL_NAME=$(RUBY_INSTALL_NAME) $(LDFLAGS) $(LIBS) $(OUTFLAG)$@ ruby-runner.c +ruby-runner$(EXEEXT): ruby-runner.c ruby-runner.h + $(Q) $(PURIFY) $(CC) $(CFLAGS) $(CPPFLAGS) -DRUBY_INSTALL_NAME=$(RUBY_INSTALL_NAME) $(LDFLAGS) $(LIBS) $(OUTFLAG)$@ $< $(RBCONFIG): $(PREP) diff --git a/template/ruby-runner.c.in b/ruby-runner.c similarity index 87% rename from template/ruby-runner.c.in rename to ruby-runner.c index 75be21573f..c16e7c6829 100644 --- a/template/ruby-runner.c.in +++ b/ruby-runner.c @@ -3,9 +3,7 @@ #include #include -#define BUILDDIR "@abs_top_builddir@" -#define LIBPATHENV "@LIBPATHENV@" -#define PATH_SEP '@PATH_SEPARATOR@' +#include "ruby-runner.h" #define STRINGIZE(expr) STRINGIZE0(expr) #define STRINGIZE0(expr) #expr diff --git a/template/ruby-runner.h.in b/template/ruby-runner.h.in new file mode 100644 index 0000000000..b0647fd0e1 --- /dev/null +++ b/template/ruby-runner.h.in @@ -0,0 +1,3 @@ +#define BUILDDIR "@abs_top_builddir@" +#define LIBPATHENV "@LIBPATHENV@" +#define PATH_SEP '@PATH_SEPARATOR@'