Author: astitcher
Date: Wed Nov 9 19:38:16 2011
New Revision: 1199929
URL: http://svn.apache.org/viewvc?rev=1199929&view=rev
Log:
QPID-3464: Build improvements (autotools) [from Jan-Marek Glogowski]
- Improved the perl bindings build
Added:
qpid/trunk/qpid/cpp/bindings/qpid/perl/Makefile.PL.in
Removed:
qpid/trunk/qpid/cpp/bindings/qpid/perl/Makefile.am
Modified:
qpid/trunk/qpid/cpp/bindings/qpid/Makefile.am
qpid/trunk/qpid/cpp/configure.ac
Modified: qpid/trunk/qpid/cpp/bindings/qpid/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/Makefile.am?rev=1199929&r1=1199928&r2=1199929&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/Makefile.am Wed Nov 9 19:38:16 2011
@@ -32,7 +32,49 @@ SUBDIRS += python
endif
if HAVE_PERL_DEVEL
-SUBDIRS += perl
+
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
-I$(top_srcdir)/src -I$(top_builddir)/src -I$(PERL_INC)
+
+EXTRA_DIST += perl/perl.i
+BUILT_SOURCES = perl/cqpid_perl.cpp
+SWIG_FLAGS = -w362,401
+
+perl/cqpid_perl.cpp: $(srcdir)/perl/perl.i $(srcdir)/qpid.i
$(srcdir)/../swig_perl_typemaps.i
+ $(SWIG) -perl -c++ $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS)
-I/usr/include -o perl/cqpid_perl.cpp $(srcdir)/perl/perl.i
+
+perl/Makefile: perl/cqpid_perl.cpp
+ cd perl; \
+ $(PERL) Makefile.PL PREFIX=$(prefix) LIB=$(PERL_ARCHLIB) ; \
+ cd ..
+
+all-local: perl/Makefile
+ cd perl; \
+ $(MAKE) OPTIMIZE="$(CXXFLAGS)" ; \
+ cd ..
+
+install-exec-local:
+ cd perl ; \
+ $(MAKE) pure_install DESTDIR=$(prefix) ; \
+ cd ..
+
+clean-local:
+ cd perl ; \
+ $(MAKE) clean ; \
+ cd ..
+
+distclean-local:
+ cd perl ; \
+ $(MAKE) distclean ; \
+ cd ..
+
+maintainer-clean-local:
+ cd perl ; \
+ $(PERL) maintainer-clean ; \
+ cd ..
+
+DISTCLEANFILES = perl/Makefile.PL
+CLEANFILES = perl/cqpid_perl.cpp perl/Makefile.old perl/cqpid_perl.pm
+
endif
endif
Added: qpid/trunk/qpid/cpp/bindings/qpid/perl/Makefile.PL.in
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/perl/Makefile.PL.in?rev=1199929&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/perl/Makefile.PL.in (added)
+++ qpid/trunk/qpid/cpp/bindings/qpid/perl/Makefile.PL.in Wed Nov 9 19:38:16
2011
@@ -0,0 +1,18 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+use ExtUtils::MakeMaker;
+use Config;
+
+WriteMakefile(
+ NAME => 'cqpid_perl',
+ PREREQ_PM => {},
+ AUTHOR => 'Jan-Marek Glogowski <glo...@fbihome.de>',
+ LIBS => ["-L@top_builddir@/src/.libs -lqpidmessaging
-lqpidtypes"],
+ DEFINE => '',
+ INC => '-I@top_srcdir@/include -I@top_builddir@/include
-I@top_srcdir@/src -I@top_builddir@/src -I@PERL_INC@',
+ C => ['cqpid_perl.cpp'],
+ # Un-comment this if you add C files to link with later:
+ OBJECT => 'cqpid_perl.o',
+);
Modified: qpid/trunk/qpid/cpp/configure.ac
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/configure.ac?rev=1199929&r1=1199928&r2=1199929&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/configure.ac (original)
+++ qpid/trunk/qpid/cpp/configure.ac Wed Nov 9 19:38:16 2011
@@ -223,7 +223,8 @@ if test -n "$PERL"; then
PERL_ARCHLIB=`perl -MConfig -e 'print "$Config{archlib}";'`
AC_CHECK_FILE( ["$PERL_ARCHLIB/CORE/perl.h"],
[AC_SUBST([PERL_INC], ["$PERL_ARCHLIB/CORE"])] )
-fi
+ AC_SUBST(PERL_ARCHLIB)
+fi
AM_CONDITIONAL([HAVE_PERL_DEVEL], [test -n "$PERL" && test -n "$SWIG" && test
-n "$PERL_INC"])
specdir=`pwd`/$srcdir/../specs
@@ -525,7 +526,7 @@ AC_CONFIG_FILES([
bindings/qpid/Makefile
bindings/qpid/ruby/Makefile
bindings/qpid/python/Makefile
- bindings/qpid/perl/Makefile
+ bindings/qpid/perl/Makefile.PL
bindings/qpid/dotnet/Makefile
bindings/qmf/Makefile
bindings/qmf/ruby/Makefile
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
