diff options
| -rwxr-xr-x | cpp/bootstrap | 7 | ||||
| -rw-r--r-- | cpp/qpidc.spec.in | 8 | ||||
| -rwxr-xr-x | cpp/rubygen/generate | 26 | ||||
| -rw-r--r-- | cpp/src/Makefile.am | 6 |
4 files changed, 22 insertions, 25 deletions
diff --git a/cpp/bootstrap b/cpp/bootstrap index d96749e14b..feb45f7510 100755 --- a/cpp/bootstrap +++ b/cpp/bootstrap @@ -4,11 +4,6 @@ aclocal -I m4 autoheader libtoolize --automake -# These are needed only if you don't already have the gen/*.{h,cpp} files. -: ${JAVA=java} -: ${JAVAC=javac} -export JAVA JAVAC - # Generate (for automake) lots of repetitive parts of tests/Makefile.am. (cd src/tests && rm -f gen.mk perl -ne '/^(include |if |else|endif)/ or print' Makefile.am \ @@ -21,8 +16,6 @@ cat > src/rubygen.mk <<EOF \$(rgen_cmd) EOF -touch src/generate.mk - automake autoconf diff --git a/cpp/qpidc.spec.in b/cpp/qpidc.spec.in index 720f1b0f40..14a0805d88 100644 --- a/cpp/qpidc.spec.in +++ b/cpp/qpidc.spec.in @@ -5,7 +5,7 @@ Name: @PACKAGE@ Version: @VERSION@ -Release: 6%{?dist} +Release: 7%{?dist} Summary: Libraries for Qpid C++ client applications Group: System Environment/Libraries License: Apache Software License @@ -13,7 +13,6 @@ URL: @URL@ Source0: @DOWNLOAD_URL@/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: apr-devel BuildRequires: boost-devel BuildRequires: cppunit-devel BuildRequires: doxygen @@ -23,7 +22,6 @@ BuildRequires: help2man BuildRequires: libtool BuildRequires: pkgconfig -Requires: apr Requires: boost Requires(post):/sbin/chkconfig @@ -40,7 +38,6 @@ the AMQP protocol. Summary: Header files and documentation for developing Qpid C++ clients Group: Development/System Requires: %name = %version-%release -Requires: apr-devel Requires: boost-devel Requires: e2fsprogs-devel @@ -151,6 +148,8 @@ fi %changelog +* Thu Sep 20 2007 Alan Conway <aconway@redhat.com> - 0.2-7 +- Removed apr dependency. * Wed Aug 1 2007 Alan Conway <aconway@redhat.com> - 0.2-6 - added --disable-cluster flag @@ -188,3 +187,4 @@ fi * Fri Dec 8 2006 David Lutterkort <dlutter@redhat.com> - 0.1-1 - Initial version based on Jim Meyering's sketch and discussions with Alan Conway + diff --git a/cpp/rubygen/generate b/cpp/rubygen/generate index e35a5458ea..dba3b81273 100755 --- a/cpp/rubygen/generate +++ b/cpp/rubygen/generate @@ -30,6 +30,8 @@ else end templates.each { |t| load t } +def make_continue(lines) lines.join(" \\\n "); end + # Generate makefile makefile=ARGV.grep(/.mk$/)[0] if makefile @@ -39,25 +41,33 @@ if makefile Dir.chdir dir rgen_generator=generator_files.map{ |f| "$(rgen_dir)/#{f}" } rgen_srcs=GenFiles.get.map{ |f| "#{Outdir}/#{f}" } - rgen_client_cpp = rgen_srcs.select { |f| f =~ /qpid\/client\/.+\.cpp$/ } - rgen_common_cpp = rgen_srcs.select { |f| f =~ /qpid\/framing\/.+\.cpp$/ } - rgen_h = rgen_srcs.select { |f| f =~ /.+\.h$/ } File.open(makefile, 'w') { |out| out << <<EOS # Generated makefile fragment. # Including makefile defines $(rgen_dir) $(rgen_cmd) and $(specs). -rgen_generator=#{rgen_generator.join(" \\\n ")} +rgen_generator=#{make_continue rgen_generator} -rgen_client_cpp=#{rgen_client_cpp.join(" \\\n ")} +rgen_client_cpp=#{make_continue(rgen_srcs.grep %r|/qpid/client/.+\.cpp$|)} -rgen_common_cpp=#{rgen_common_cpp.join(" \\\n ")} +rgen_common_cpp=#{make_continue(rgen_srcs.grep %r|qpid/framing/.+\.cpp$|)} -rgen_h=#{rgen_h.join(" \\\n ")} +rgen_srcs=#{make_continue rgen_srcs} -rgen_srcs=rgen_h rgen_client_cpp rgen_common_cpp +# Header file install rules. +EOS + ["framing", "client", "broker"].each { |ns| + dir="qpid/#{ns}" + dir_ = dir.tr("/", "_") + regex=%r|#{dir}/.+\.h$| + out << <<EOS +#{dir_}dir = $(includedir)/#{dir} +dist_#{dir_}_HEADERS = #{make_continue rgen_srcs.grep(regex)} +EOS + } + out << <<EOS if GENERATE $(rgen_srcs) $(srcdir)/#{File.basename makefile}: $(rgen_generator) $(specs) $(rgen_cmd) diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index 06d17c5ccc..7f25c194d4 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -14,14 +14,8 @@ force: # AMQP_XML is defined in ../configure.ac specs=@AMQP_XML@ $(top_srcdir)/xml/cluster.xml -EXTRA_DIST += $(rgen_h) - - if GENERATE -maintainer-clean-local: - rm -rf gen - # Ruby generator. rgen_dir=$(top_srcdir)/rubygen rgen_cmd=ruby -I $(rgen_dir) $(rgen_dir)/generate $(srcdir)/gen $(specs) all $(srcdir)/rubygen.mk |