List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:January 23 2008 5:25am
Subject:Rev 424: Fixed perl for make distcheck in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel
View as plain text  
At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel

------------------------------------------------------------
revno: 424
revision-id:mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: devel
timestamp: Wed 2008-01-23 00:25:37 -0500
message:
  Fixed perl for make distcheck
modified:
  perl/Makefile.am               makefile.am-20070228070325-lv4v4ey3018yr147-1
=== modified file 'perl/Makefile.am'
--- a/perl/Makefile.am	2008-01-11 19:34:54 +0000
+++ b/perl/Makefile.am	2008-01-23 05:25:37 +0000
@@ -13,22 +13,26 @@
 CLEANFILES=$(PERL_CRUFT) ${SWIG_OUTPUTS}
 MAINTAINERCLEANFILES=
 
-SWIG_OPTS=-perl5 $(DEFS) -outdir lib -I${top_srcdir} -I$(SWIG_DIR) -I$(srcdir)/swig
$(MYSQL_INCLUDES)
+SWIG_OPTS=-perl5 $(DEFS) -outdir ${builddir}/lib -I${top_builddir} -I${top_srcdir}
-I$(SWIG_DIR) -I$(srcdir)/swig $(MYSQL_INCLUDES)
 
 #ndbapi/ndbapi_wrap.cpp lib/mysql/cluster/ndbapi.pm: ndbapi.i  $(SWIG_NDB_SOURCES) 
-ndbapi/ndbapi_wrap.cpp lib/ndbapi.pm: ndbapi.i  $(SWIG_NDB_SOURCES) 
-	mkdir -p lib #/mysql/cluster
-	$(SWIG) $(SWIG_OPTS) -o ndbapi/ndbapi_wrap.cpp ndbapi.i
-
-mgmapi/mgmapi_wrap.cpp lib/mgmapi.pm: mgmapi.i  $(SWIG_MGM_SOURCES) 
-	mkdir -p lib #/mysql/cluster
-	$(SWIG) $(SWIG_OPTS) -o mgmapi/mgmapi_wrap.cpp mgmapi.i
-
-$(PERL_MAKEFILE): $(srcdir)/Makefile.PL ndbapi/ndbapi_wrap.cpp mgmapi/mgmapi_wrap.cpp
lib/ndbapi.pm lib/mgmapi.pm $(srcdir)/Makefile.am
+${builddir}/ndbapi/ndbapi_wrap.cpp ${builddir}/lib/ndbapi.pm: ${srcdir}/ndbapi.i 
$(SWIG_NDB_SOURCES) 
+	@mkdir -p ${builddir}/lib 
+	@mkdir -p ${builddir}/ndbapi
+	$(SWIG) $(SWIG_OPTS) -o ${builddir}/ndbapi/ndbapi_wrap.cpp ${srcdir}/ndbapi.i
+
+${builddir}/mgmapi/mgmapi_wrap.cpp ${builddir}/lib/mgmapi.pm: ${srcdir}/mgmapi.i 
$(SWIG_MGM_SOURCES) 
+	@mkdir -p ${builddir}/lib
+	@mkdir -p ${builddir}/mgmapi
+	$(SWIG) $(SWIG_OPTS) -o ${builddir}/mgmapi/mgmapi_wrap.cpp ${srcdir}/mgmapi.i
+
+$(PERL_MAKEFILE): $(srcdir)/Makefile.PL ${builddir}/ndbapi/ndbapi_wrap.cpp
${builddir}/mgmapi/mgmapi_wrap.cpp ${builddir}/lib/ndbapi.pm ${builddir}/lib/mgmapi.pm
$(srcdir)/Makefile.am
 	echo "$(DEB_MAKE_PL_OPT) should be INSTALLDIRS=vendor"
-	CFLAGS="-I../.. -I../../mgmpp $(CPPFLAGS) $(CFLAGS) $(MYSQL_INCLUDES)"
LDFLAGS="$(AM_LDFLAGS) $(LDFLAGS) $(LIBS)" $(PERL) $(srcdir)/Makefile.PL $(MAKE_PL_OPTS)
$(DEB_MAKE_PL_OPT) PREFIX="${prefix}"
+	test ! ${srcdir}/Makefile.PL -ef ${builddir}/Makefile.PL && cp
${srcdir}/Makefile.PL ${builddir}/Makefile.PL
+	CFLAGS="-I${top_builddir} -I${top_srcdir} $(CPPFLAGS) $(CFLAGS) $(MYSQL_INCLUDES)"
LDFLAGS="$(AM_LDFLAGS) $(LDFLAGS) $(LIBS)" $(PERL) $(srcdir)/Makefile.PL $(MAKE_PL_OPTS)
$(DEB_MAKE_PL_OPT) PREFIX="${prefix}"
+	test ! ${srcdir}/Makefile.PL -ef ${builddir}/Makefile.PL && rm -f
${builddir}/Makefile.PL
 	
--perl install-perl: $(PERL_MAKEFILE) ndbapi/ndbapi_wrap.cpp mgmapi/mgmapi_wrap.cpp
+-perl install-perl: $(PERL_MAKEFILE) ${builddir}/ndbapi/ndbapi_wrap.cpp
${builddir}/mgmapi/mgmapi_wrap.cpp
 	@target=`echo $@ | sed -e 's/-perl//'`; \
 	echo $(MAKE) -f $(PERL_MAKEFILE) $$target; \
 	DESTDIR=$(DESTDIR) $(MAKE) $(AM_MAKEFLAGS) -f $(PERL_MAKEFILE) $$target 
PREFIX="${prefix}"

Thread
Rev 424: Fixed perl for make distcheck in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/develMonty Taylor23 Jan