The great merge

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@4141 626c5289-ae23-0410-ae9c-e8d60b6d4f22

SWIG/Examples/guile/matrix/Makefile

@@ -1,4 +1,3 @@
-CC     = gcc
 SRCS   = matrix.c vector.c
 TARGET = matrix
 IFILE  = package.i
@@ -10,11 +9,10 @@ all::
 		SRCS='$(SRCS)'			\
 		TARGET=$(TARGET)		\
 		IFILE=$(IFILE)			\
-		CC=$(CC)			\
 		MODULE=$(MODULE)		\
 	  sub-all
 
 clean::
-	rm -f matrix *_wrap* *~ .~* core
+	$(MAKE) -f $(MKDIR)/Makefile TARGET='$(TARGET)' guile_clean
 
 check: all

SWIG/Examples/guile/matrix/README

@@ -1,7 +1,7 @@
 Matrix example.  To run the example, execute the program 'matrix' and
 type the following :
 
-	(load 'matrix.scm)
+	(load "matrix.scm")
 	(do-test 0)
 
 Alternatively, use the command-line:

SWIG/Examples/guile/matrix/matrix.c

@@ -1,4 +1,6 @@
 /*   FILE : matrix.c : some simple 4x4 matrix operations */
+#include <stdlib.h>
+#include <stdio.h>
 
 double **new_matrix() {
 

SWIG/Examples/guile/matrix/matrix.i

@@ -12,7 +12,8 @@ double get_m(double **M, int i, int j) {
 }
 %}
 
-%section "Matrix Operations"
+/*** Matrix Operations ***/
+
 extern double **new_matrix();
 /* Creates a new matrix and returns a pointer to it */
 

SWIG/Examples/guile/matrix/package.i

@@ -1,7 +1,8 @@
 // FILE : package.i
 // See the SWIG users manual
 
-%title "Matrix and vector package"
+/*** Matrix and vector package ***/
+
 %module Matrix
 %{
 #include <math.h>

SWIG/Examples/guile/matrix/vector.c

@@ -1,5 +1,7 @@
 /* File : vector.c */
 
+#include <stdlib.h>
+#include <stdio.h>
 #include "vector.h"
 
 Vector *createv(double x, double y, double z, double w) {