Merge branch 'maverick' into develop

Compile under OSX

matrix/Makefile

@@ -1,34 +0,0 @@
-#---------------------------------------------------------------------------
-# Makefile for the Matrix library
-#
-# Mark Koennecke, November 1996
-#--------------------------------------------------------------------------
-OBJ=   matadd.o matcreat.o matdet.o matdump.o matdurbn.o materr.o \
-       matinv.o matmul.o matsolve.o matsub.o matsubx.o mattoepz.o \
-       mattran.o
-
-#---------- for Redhat linux
-#CC= gcc
-#CFLAGS= -I/usr/local/include -I. -I../ -DLINUX   -g -c
-
-#------------ for DigitalUnix
-CC=cc
-CFLAGS= -I/data/koenneck/include -I. -I../   -std1 -g -c
-#------------ for DigitalUnix with Fortify
-#CFLAGS= -I/data/koenneck/include -DFORTIFY -I. -I../   -std1 -g -c
-
-#------------ for CYGNUS toolchain on Win32
-#CC=gcc
-#CFLAGS= -I. -I../ -DCYGNUS -g -c
-
-.c.o:
-	$(CC) $(CFLAGS) $*.c
-
-matrix: $(OBJ)
-	- rm -f libmatrix.a
-	ar cr libmatrix.a $(OBJ)
-	ranlib libmatrix.a
-
-clean:
-	rm -f *.o
-	rm -f *.a

matrix/makefile

@@ -1,21 +1,34 @@
-# M. Zolliker 03.2005
+#---------------------------------------------------------------------------
+# Makefile for the Matrix library
+#
+# Mark Koennecke, November 1996
+#--------------------------------------------------------------------------
+OBJ=   matadd.o matcreat.o matdet.o matdump.o matdurbn.o materr.o \
+       matinv.o matmul.o matsolve.o matsub.o matsubx.o mattoepz.o \
+       mattran.o
 
-%: usage
-	@echo
+#---------- for Redhat linux
+#CC= gcc
+#CFLAGS= -I/usr/local/include -I. -I../ -DLINUX   -g -c
 
-%.o: usage
-	@echo
+#------------ for DigitalUnix
+CC=cc
+CFLAGS= -I/data/koenneck/include -I. -I../   -std1 -g -c
+#------------ for DigitalUnix with Fortify
+#CFLAGS= -I/data/koenneck/include -DFORTIFY -I. -I../   -std1 -g -c
 
-default: usage
+#------------ for CYGNUS toolchain on Win32
+#CC=gcc
+#CFLAGS= -I. -I../ -DCYGNUS -g -c
 
-usage:
-	@ echo ""
-	@ echo "Usage:"
-	@ echo ""
-	@ echo "    make -f makefile_xxx [target]"
-	@ echo ""
-	@ echo '  where makefile_xxx is one of'
-	@ echo ""
-	@ ls -1 makefile_* | pr -t -o 4
+.c.o:
+	$(CC) $(CFLAGS) $*.c
 
+matrix: $(OBJ)
+	- rm -f libmatrix.a
+	ar cr libmatrix.a $(OBJ)
+	ranlib libmatrix.a
 
+clean:
+	rm -f *.o
+	rm -f *.a

matrix/makefile_macosx

@@ -0,0 +1,16 @@
+#---------------------------------------------------------------------------
+# Makefile for the Matrix library
+#
+# Mark Koennecke, November 1996
+# Markus Zolliker, March 2003
+#--------------------------------------------------------------------------
+
+include ../linux_def
+
+CC       = clang
+CFLAGS   = -g $(DFORTIFY) -MMD
+
+include make_gen
+
+-include $(OBJ:.o=.d)
+