List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:January 20 2008 10:21pm
Subject:Rev 416: Removed GNU Make extension 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: 416
revision-id:mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: devel
timestamp: Sun 2008-01-20 14:21:09 -0800
message:
  Removed GNU Make extension
  Added depend on ${SWIG_BIN}, along with a rule to build it.
modified:
  csharp/Makefile.am             makefile.in-20070228073157-gkwqutuh9f3nq7s2-1
=== modified file 'csharp/Makefile.am'
--- a/csharp/Makefile.am	2008-01-15 17:08:47 +0000
+++ b/csharp/Makefile.am	2008-01-20 22:21:09 +0000
@@ -1,4 +1,4 @@
-NDBAPI_SOURCE = $(shell ls ndbapi/*cs)
+NDBAPI_SOURCE =  ndbapi/*.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
 CLEANFILES = ndbapi.dll *exe test/*exe ndbapi.cpp MySql.Cluster.NdbApi.dll
ndbapi/generated/* mgmapi/generated/* mgmapi.cpp MySql.Cluster.MgmApi.dll
@@ -13,7 +13,7 @@
 libmgmcli_la_CPPFLAGS = $(PTHREAD_CFLAGS)
 libmgmcli_la_DEPENDENCIES = MySql.Cluster.MgmApi.dll 
 
-EXTRA_DIST = ndbapi.i mgmapi.i ndbapi/*.cs mgmapi/*.cs test/*cs connectors.snk
*.dll.config
+EXTRA_DIST = ndbapi.i mgmapi.i $(NDBAPI_SOURCE) mgmapi/*.cs test/*cs connectors.snk
*.dll.config
 
 clean-local:
 	@rm -rf ndbapi/generated mgmapi/generated
@@ -38,11 +38,14 @@
 
 mgmapi.cpp: ${SWIG_MGM_SOURCES}
 
-mgmapi.cpp: mgmapi.i ${SWIG_SOURCES}
+${SWIG_BIN}:
+	( cd $(top_builddir)/swig && $(MAKE) $(AM_MAKEFLAGS) )
+
+mgmapi.cpp: mgmapi.i ${SWIG_SOURCES} ${SWIG_BIN}
 	@mkdir -p $*/generated
 	${SWIG} -csharp -dllimport libmgmcli -namespace MySql.Cluster.MgmApi \
 		-I$(top_srcdir) -I$(SWIG_DIR) $(MYSQL_INCLUDES) -outdir $*/generated -o $@ $<
-ndbapi.cpp: ndbapi.i ${SWIG_SOURCES}
+ndbapi.cpp: ndbapi.i ${SWIG_SOURCES} ${SWIG_BIN}
 	@mkdir -p $*/generated
 	${SWIG} -csharp -dllimport libndbcli -namespace MySql.Cluster.NdbApi \
 		-I$(top_srcdir) -I$(SWIG_DIR) $(MYSQL_INCLUDES) -outdir $*/generated -o $@ $<

Thread
Rev 416: Removed GNU Make extension in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/develMonty Taylor21 Jan