diff options
| author | malosek <malosek@fastmq.com> | 2009-09-16 17:06:59 +0200 |
|---|---|---|
| committer | malosek <malosek@fastmq.com> | 2009-09-16 17:06:59 +0200 |
| commit | 1a655045951c29edda0b616640b9dac507cda164 (patch) | |
| tree | 6cd013eda2331cd5a19e3cd19d14f35b997f3a7d | |
| parent | c63387ca3657848c0eaa8014a863148c1e6525ff (diff) | |
ruby directory moved into bindings dir
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | bindings/Makefile.am | 8 | ||||
| -rw-r--r-- | bindings/ruby/Makefile.am (renamed from ruby/Makefile.am) | 0 | ||||
| -rw-r--r-- | bindings/ruby/extconf.rb (renamed from ruby/extconf.rb) | 0 | ||||
| -rw-r--r-- | bindings/ruby/rbzmq.cpp (renamed from ruby/rbzmq.cpp) | 0 | ||||
| -rw-r--r-- | configure.in | 2 |
6 files changed, 10 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 82bddfe..b06c00e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,15 +1,12 @@ -if BUILD_RUBY -DIR_R = ruby -endif - if BUILD_PERF DIR_PERF = perf endif -SUBDIRS = src $(DIR_R) $(DIR_PERF) devices bindings -DIST_SUBDIRS = src ruby perf devices bindings +SUBDIRS = src $(DIR_PERF) devices bindings +DIST_SUBDIRS = src perf devices bindings EXTRA_DIST = $(top_srcdir)/foreign/openpgm/@pgm_basename@.tar.bz2 dist-hook: -rm -rf $(distdir)/foreign/openpgm/@pgm_basename@ + diff --git a/bindings/Makefile.am b/bindings/Makefile.am index 2b877ed..77b4ec2 100644 --- a/bindings/Makefile.am +++ b/bindings/Makefile.am @@ -6,6 +6,10 @@ if BUILD_PYTHON DIR_P = python endif -SUBDIRS = $(DIR_J) $(DIR_P) -DIST_SUBDIRS = java python +if BUILD_RUBY +DIR_R = ruby +endif + +SUBDIRS = $(DIR_J) $(DIR_P) $(DIR_R) +DIST_SUBDIRS = java python ruby diff --git a/ruby/Makefile.am b/bindings/ruby/Makefile.am index 148daf0..148daf0 100644 --- a/ruby/Makefile.am +++ b/bindings/ruby/Makefile.am diff --git a/ruby/extconf.rb b/bindings/ruby/extconf.rb index f931c5e..f931c5e 100644 --- a/ruby/extconf.rb +++ b/bindings/ruby/extconf.rb diff --git a/ruby/rbzmq.cpp b/bindings/ruby/rbzmq.cpp index bf0d9bc..bf0d9bc 100644 --- a/ruby/rbzmq.cpp +++ b/bindings/ruby/rbzmq.cpp diff --git a/configure.in b/configure.in index eee00c3..f518509 100644 --- a/configure.in +++ b/configure.in @@ -489,7 +489,7 @@ AC_TYPE_SIGNAL AC_CHECK_FUNCS(perror gettimeofday memset socket getifaddrs freeifaddrs) AC_OUTPUT(Makefile src/Makefile bindings/python/Makefile \ - bindings/python/setup.py ruby/Makefile \ + bindings/python/setup.py bindings/ruby/Makefile \ bindings/java/Makefile perf/Makefile perf/c/Makefile perf/cpp/Makefile \ perf/python/Makefile perf/ruby/Makefile perf/java/Makefile src/libzmq.pc \ devices/Makefile devices/zmq_forwarder/Makefile bindings/Makefile) |