List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:January 23 2008 6:57am
Subject:Rev 425: More changes 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: 425
revision-id:mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: devel
timestamp: Wed 2008-01-23 01:57:26 -0500
message:
  More changes for make distcheck.
modified:
  csharp/Makefile.am             makefile.in-20070228073157-gkwqutuh9f3nq7s2-1
  perl/Makefile.am               makefile.am-20070228070325-lv4v4ey3018yr147-1
=== modified file 'csharp/Makefile.am'
--- a/csharp/Makefile.am	2008-01-23 00:20:13 +0000
+++ b/csharp/Makefile.am	2008-01-23 06:57:26 +0000
@@ -1,6 +1,7 @@
-NDBAPI_SOURCE =  ndbapi/*.cs
+NDBAPI_SOURCE =  $(srcdir)/ndbapi/*.cs
+MGMAPI_SOURCE =  $(srcdir)/mgmapi/*.cs
 NDBAPI_BUILT_SRC=AbortOption.cs             NdbScanOperation.cs ExecType.cs              
 NdbTransaction.cs Ndb_cluster_connection.cs  SWIGTYPE*cs ndb.cs                    
Ndb.cs                      NdbOperation.cs            ndbPINVOKE.cs          
NdbRecAttr.cs NdbError.cs NdbFactory.cs
-MYSQL_DLL = MySql.Data.dll
+MYSQL_DLL = $(srcdir)/MySql.Data.dll
 CLEANFILES = ndbapi.dll *exe test/*exe ndbapi.cpp MySql.Cluster.NdbApi.dll
ndbapi/generated/* mgmapi/generated/* mgmapi.cpp MySql.Cluster.MgmApi.dll
 
 lib_LTLIBRARIES = libndbcli.la libmgmcli.la
@@ -16,19 +17,20 @@
 EXTRA_DIST = ndbapi.i mgmapi.i $(NDBAPI_SOURCE) mgmapi/*.cs test/*cs connectors.snk
*.dll.config
 
 clean-local:
-	@rm -rf ndbapi/generated mgmapi/generated
+	@rm -rf $(builddir)/ndbapi/generated $(builddir)/mgmapi/generated
 
 test: test/test.exe test/test2.exe 
 
 SUFFIXES = .exe .cs .i .cpp
 
 .cs.exe: MySql.Cluster.NdbApi.dll ndbapi.cpp
-	$(MCS) -r:MySql.Cluster.NdbApi.dll -r:$(MYSQL_DLL) $<
+	$(MCS) -r:$(builddir)/MySql.Cluster.NdbApi.dll -r:$(MYSQL_DLL) $<
 
-MySql.Cluster.MgmApi.dll: 
-	$(MCS) -target:library -out:$@ mgmapi/*.cs mgmapi/generated/*.cs 
+MySql.Cluster.MgmApi.dll: $(MGMAPI_SOURCE) 
+	@cp -f $(srcdir)/connectors.snk $(builddir)/connectors.snk
+	$(MCS) -target:library -out:$(builddir)/$@ $(srcdir)/mgmapi/*.cs
$(builddir)/mgmapi/generated/*.cs 
 MySql.Cluster.NdbApi.dll: $(NDBAPI_SOURCE)
-	$(MCS) -target:library -out:$@ ndbapi/*.cs ndbapi/generated/*.cs 
+	$(MCS) -target:library -out:$(builddir)/$@ $(srcdir)/ndbapi/*.cs
$(builddir)/ndbapi/generated/*.cs 
 
 #$(CSHARP_SOURCES)
 #.PRECIOUS: %.cpp %.so %.dll
@@ -42,13 +44,18 @@
 	( cd $(top_builddir)/swig && $(MAKE) $(AM_MAKEFLAGS) )
 
 mgmapi.cpp: mgmapi.i ${SWIG_SOURCES} ${SWIG_BIN}
-	@mkdir -p $*/generated
+	@mkdir -p $(builddir)/$*/generated
 	${SWIG} -csharp -dllimport libmgmcli -namespace MySql.Cluster.MgmApi \
-		-I$(top_srcdir) -I$(SWIG_DIR) $(MYSQL_INCLUDES) -outdir $*/generated -o $@ $<
+		-I$(top_builddir) -I$(top_srcdir) -I$(SWIG_DIR) \
+		$(MYSQL_INCLUDES) -outdir $(builddir)/$*/generated \
+		-o ${builddir}/$@ $<
+
 ndbapi.cpp: ndbapi.i ${SWIG_SOURCES} ${SWIG_BIN}
-	@mkdir -p $*/generated
+	@mkdir -p $(builddir)/$*/generated
 	${SWIG} -csharp -dllimport libndbcli -namespace MySql.Cluster.NdbApi \
-		-I$(top_srcdir) -I$(SWIG_DIR) $(MYSQL_INCLUDES) -outdir $*/generated -o $@ $<
+		-I$(top_builddir) -I$(top_srcdir) -I$(SWIG_DIR) \
+		$(MYSQL_INCLUDES) -outdir $(builddir)/$*/generated \
+		-o ${builddir}/$@ $<
 
 install-exec-local: MySql.Cluster.NdbApi.dll  MySql.Cluster.MgmApi.dll
 	mkdir -p $(DESTDIR)$(datadir)/cli

=== modified file 'perl/Makefile.am'
--- a/perl/Makefile.am	2008-01-23 05:25:37 +0000
+++ b/perl/Makefile.am	2008-01-23 06:57:26 +0000
@@ -30,7 +30,6 @@
 	echo "$(DEB_MAKE_PL_OPT) should be INSTALLDIRS=vendor"
 	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) ${builddir}/ndbapi/ndbapi_wrap.cpp
${builddir}/mgmapi/mgmapi_wrap.cpp
 	@target=`echo $@ | sed -e 's/-perl//'`; \
@@ -41,6 +40,7 @@
 	$(RUN)$(MAKE) -f $(PERL_MAKEFILE) test
 
 clean-perl realclean-perl:
+	test ! ${srcdir}/Makefile.PL -ef ${builddir}/Makefile.PL && rm -f
${builddir}/Makefile.PL
 	@target=`echo $@ | sed -e 's/-perl//'`; \
 	if test -r $(PERL_MAKEFILE); then \
 	  echo $(MAKE) -f $(PERL_MAKEFILE) $$target; \

Thread
Rev 425: More changes for make distcheck. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/develMonty Taylor23 Jan