List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:October 11 2007 8:36am
Subject:Rev 180: Fixed almost all of the make portability warnings. There's still one in the ruby dir that I'm not happy about. in http://bazaar.launchpad.net...
View as plain text  
At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbjmerge

------------------------------------------------------------
revno: 180
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: ndbjmerge
timestamp: Thu 2007-10-11 01:35:50 -0700
message:
  Fixed almost all of the make portability warnings. There's still one in the ruby dir
that I'm not happy about.
modified:
  autogen.sh                     autogen.sh-20070403035013-eanu2y6tkwm0151w-1
  csharp/Makefile.am             makefile.in-20070228073157-gkwqutuh9f3nq7s2-1
  java/Makefile.am               makefile.am-20070415032352-9dpe6aurqcnuwcrd-1
  lua/Makefile.am                makefile.am-20070727221140-30x3yi1g0lf9rflk-2
  python/Makefile.am             makefile.am-20070925115907-x2wrdte5kicyfrrw-1
  ruby/Makefile.am               makefile.am-20070228212451-7arjxk90dkwcn5xr-2
=== modified file 'autogen.sh'
--- a/autogen.sh	2007-04-23 23:09:49 +0000
+++ b/autogen.sh	2007-10-11 08:35:50 +0000
@@ -1,3 +1,3 @@
 #!/bin/sh 
 
-autoreconf -i --force
+autoreconf -i --force -W gnu

=== modified file 'csharp/Makefile.am'
--- a/csharp/Makefile.am	2007-10-05 03:52:23 +0000
+++ b/csharp/Makefile.am	2007-10-11 08:35:50 +0000
@@ -10,7 +10,9 @@
 
 test: test.exe test2.exe 
 
-%.exe: %.cs MySql.Cluster.NdbApi.dll ndbapi.cpp
+SUFFIXES = .exe .cs .i .cpp
+
+.cs.exe: MySql.Cluster.NdbApi.dll ndbapi.cpp
 	$(MCS)  -r:MySql.Cluster.NdbApi.dll -r:$(MYSQL_DLL) $<
 
 MySql.Cluster.NdbApi.dll: 
@@ -20,7 +22,7 @@
 #.PRECIOUS: %.cpp %.so %.dll
 #/usr/bin/objcopy --set-section-flags .debug_str=contents,debug $@
 
-%.cpp: %.i ${SWIG_SOURCES}
+.i.cpp: ${SWIG_SOURCES}
 	@mkdir -p $*
 	${SWIG} -csharp -dllimport libndbsharp -namespace MySql.Cluster.NdbApi \
 		-I$(SWIG_DIR) $(MYSQL_INCLUDES) -outdir $* -o $@ $<

=== modified file 'java/Makefile.am'
--- a/java/Makefile.am	2007-10-05 03:52:23 +0000
+++ b/java/Makefile.am	2007-10-11 08:35:50 +0000
@@ -1,18 +1,18 @@
 package_namespace = com/mysql/cluster
 ndbapi_examples_dir = $(package_namespace)/ndbapi/examples
-NDBAPI_BUILT_SRC = ndbj_wrap.cxx
-MGMAPI_BUILT_SRC = mgmj_wrap.cxx
+NDBAPI_BUILT_SRC = ndbj.cxx
+MGMAPI_BUILT_SRC = mgmj.cxx
 BUILT_SOURCES = $(NDBAPI_BUILT_SRC) $(MGMAPI_BUILT_SRC)
 NDBAPI_SWIG_SRC = ndbj.i $(SWIG_SOURCES)
 MGMAPI_SWIG_SRC = mgmj.i $(topdir)/swig/mgm.i
 CLEANFILES = $(BUILT_SOURCES) *class *log ndbj.jar *_wrap.h
 
 lib_LTLIBRARIES = libndbj.la libmgmj.la
-libndbj_la_SOURCES = ndbj_wrap.cxx
+libndbj_la_SOURCES = ndbj.cxx
 libndbj_la_LIBADD = -lstdc++
 libndbj_la_LDFLAGS = -fPIC
 libndbj_la_CPPFLAGS = $(JNI_INCLUDES) $(PTHREAD_CFLAGS) -fPIC
-libmgmj_la_SOURCES = mgmj_wrap.cxx
+libmgmj_la_SOURCES = mgmj.cxx
 libmgmj_la_CPPFLAGS = $(JNI_INCLUDES) $(PTHREAD_CFLAGS) -fPIC
 
 all-local: ndbj.jar 
@@ -20,7 +20,9 @@
 clean-local:
 	$(ANT) clean
 
-%_wrap.cxx: %.i
+SUFFIXES = .cxx .i
+
+.i.cxx:
 	$(SWIG) -java -outdir ${package_namespace}/$* -package `echo ${package_namespace}/$* |
sed 's,/,.,g'` -I$(SWIG_DIR) -I./swig $(MYSQL_INCLUDES) -o $@ $<
 
 ndbj.jar: libndbj.la libmgmj.la

=== modified file 'lua/Makefile.am'
--- a/lua/Makefile.am	2007-09-20 13:12:36 +0000
+++ b/lua/Makefile.am	2007-10-11 08:35:50 +0000
@@ -8,13 +8,15 @@
 
 SWIG_OPTS=-I$(srcdir) -I$(SWIG_DIR) @MYSQL_INCLUDES@ 
 
-%.cpp: %.i $(SWIG_SOURCES)
+SUFFIXES = .cpp .i .so .o
+
+.i.cpp: $(SWIG_SOURCES)
 	$(SWIG) -c++ -lua $(SWIG_OPTS) -o $@ $<
 
-$(srcdir)/%.o: $(srcdir)/%.cpp
+.cpp.o:
 	$(CXX) $(SWIG_OPTS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(AM_CFLAGS) $(STANDARD_CFLAGS) -fPIC -DPIC $(LUA_CFLAGS) $< -c -o $@
 
-$(srcdir)/%.so: %.o
+.o.so: 
 	echo $(CXX) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -shared $< $(LUA_LDFLAGS)
-o $@ 
 	$(CXX) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -shared $< $(LUA_LDFLAGS) -o
$@ 
 

=== modified file 'python/Makefile.am'
--- a/python/Makefile.am	2007-09-25 11:59:24 +0000
+++ b/python/Makefile.am	2007-10-11 08:35:50 +0000
@@ -14,7 +14,7 @@
 #$(srcdir)/%_wrap.o: $(srcdir)/%_wrap.cpp
 #	$(CXX) $(SWIG_OPTS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(AM_CFLAGS) $(STANDARD_CFLAGS) -fPIC -DPIC -I$(pythonarchdir) $< -c -o $@
 
-$(srcdir)/mysql/cluster/_%.so: ndbapi.i mgmapi.i
+$(srcdir)/mysql/cluster/_mysql.so: ndbapi.i mgmapi.i
 	${PYTHON} setup.py build
 
 clean-local:

=== modified file 'ruby/Makefile.am'
--- a/ruby/Makefile.am	2007-05-02 21:31:41 +0000
+++ b/ruby/Makefile.am	2007-10-11 08:35:50 +0000
@@ -8,10 +8,12 @@
 
 SWIG_OPTS=-I$(srcdir) -I$(SWIG_DIR) @MYSQL_INCLUDES@ 
 
-%.cpp: %.i $(SWIG_SOURCES)
+SUFFIXES = .cpp .o .so .i
+
+.i.cpp: $(SWIG_SOURCES)
 	$(SWIG) -c++ -ruby -autorename $(SWIG_OPTS) -o $@ $<
 
-$(srcdir)/%.o: $(srcdir)/%.cpp
+.cpp.o: 
 	$(CXX) $(SWIG_OPTS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(AM_CFLAGS) $(STANDARD_CFLAGS) -fPIC -DPIC -I$(rubyarchdir) $< -c -o $@
 
 $(srcdir)/mysql/cluster/%.so: %.o

Thread
Rev 180: Fixed almost all of the make portability warnings. There's still one in the ruby dir that I'm not happy about. in http://bazaar.launchpad.net...Monty Taylor11 Oct