Index: trunk/SophyaLib/Samba/Makefile
===================================================================
--- trunk/SophyaLib/Samba/Makefile	(revision 508)
+++ trunk/SophyaLib/Samba/Makefile	(revision 510)
@@ -3,28 +3,37 @@
 all: $(LIB)libSamba.a
 clean:
-	rm -f $(OBJ)bruit.o $(OBJ)circle.o $(OBJ)gorfph.o $(OBJ)localmap.o $(OBJ)longlat.o $(OBJ)mlobe.o $(OBJ)scan.o $(OBJ)spheregorski.o $(OBJ)spherethetaphi.o $(OBJ)unitvector.o $(OBJ)utilgeom.o $(OBJ)vector3d.o
+	rm -f $(OBJ)anagen.o $(OBJ)bruit.o $(OBJ)circle.o $(OBJ)gorfph.o $(OBJ)lambuilder.o $(OBJ)localmap.o $(OBJ)longlat.o $(OBJ)mlobe.o $(OBJ)scan.o $(OBJ)spheregorski.o $(OBJ)spherethetaphi.o $(OBJ)syngen.o $(OBJ)unitvector.o $(OBJ)utilgeom.o $(OBJ)vector3d.o
 	rm $(LIB)libSamba.a
 $(LIB)libSamba.a : $(OBJ)bruit.o $(OBJ)circle.o $(OBJ)gorfph.o $(OBJ)localmap.o $(OBJ)longlat.o $(OBJ)mlobe.o $(OBJ)scan.o $(OBJ)spheregorski.o $(OBJ)spherethetaphi.o $(OBJ)unitvector.o $(OBJ)utilgeom.o $(OBJ)vector3d.o
-	$(AR) $(ARFLAGS) $@ $?
+	$(ARCXX) $(ARCXXFLAGS) $@ $?
 ifeq ($(CXX),cxx)
 	$(CXX) $? $(CPPFLAGS) $(CXXFLAGS) -L$(LIB) -lSamba -o $(OBJ)xx.x -Hf
 endif 
  
-$(OBJ)bruit.o: bruit.cc $(INC)fmath.h \
- $(INC)cimage.h \
- $(INC)rzimage.h \
- $(INC)rzvect.h \
+$(OBJ)anagen.o: anagen.cc anagen.h $(INC)cvector.h \
+ $(INC)matrix.h \
+ $(INC)peida.h \
  $(INC)machdefs.h \
  $(INC)pclassids.h \
+ $(INC)utils.h \
+ $(INC)perrors.h \
  $(INC)pexceptions.h \
- $(INC)perrors.h \
- $(INC)datatypes.h \
+ $(INC)fmath.h \
  $(INC)ppersist.h \
- $(INC)md5.h \
- $(INC)dvlist.h bruit.h \
+ $(INC)md5.h sphericalmap.h \
+ $(INC)nbmath.h pixelmap.h \
+ $(INC)dvlist.h \
+ $(INC)objfio.h \
+ $(INC)anydataobj.h \
+ $(INC)tvector.h \
+ $(INC)tmatrix.h \
+ $(INC)ndatablock.h lambuilder.h \
+ $(INC)fftserver.h
+$(OBJ)bruit.o: bruit.cc $(INC)fmath.h bruit.h \
  $(INC)nbrandom.h \
- $(INC)hbook.h
+ $(INC)machdefs.h \
+ $(INC)pclassids.h
 $(OBJ)circle.o: circle.cc circle.h vector3d.h longlat.h utilgeom.h \
- unitvector.h
+ unitvector.h geometry.h
 $(OBJ)gorfph.o: gorfph.cc
 $(OBJ)localmap.o: localmap.cc localmap.h pixelmap.h \
@@ -34,12 +43,12 @@
  $(INC)pexceptions.h \
  $(INC)md5.h \
- $(INC)dvlist.h sphericalmap.h \
+ $(INC)dvlist.h \
+ $(INC)objfio.h \
+ $(INC)anydataobj.h sphericalmap.h \
  $(INC)nbmath.h \
- $(INC)cvector.h \
- $(INC)matrix.h \
- $(INC)peida.h \
- $(INC)utils.h \
- $(INC)perrors.h \
- $(INC)fmath.h
+ $(INC)tvector.h \
+ $(INC)tmatrix.h \
+ $(INC)ndatablock.h \
+ $(INC)piocmplx.h
 $(OBJ)longlat.o: longlat.cc longlat.h utilgeom.h
 $(OBJ)mlobe.o: mlobe.cc mlobe.h sphericalmap.h \
@@ -51,10 +60,9 @@
  $(INC)md5.h \
  $(INC)dvlist.h \
- $(INC)cvector.h \
- $(INC)matrix.h \
- $(INC)peida.h \
- $(INC)utils.h \
- $(INC)perrors.h \
- $(INC)fmath.h unitvector.h vector3d.h \
+ $(INC)objfio.h \
+ $(INC)anydataobj.h \
+ $(INC)tvector.h \
+ $(INC)tmatrix.h \
+ $(INC)ndatablock.h unitvector.h vector3d.h \
  longlat.h utilgeom.h $(INC)timing.h
 $(OBJ)scan.o: scan.cc $(INC)machdefs.h \
@@ -64,4 +72,6 @@
  $(INC)md5.h \
  $(INC)dvlist.h \
+ $(INC)objfio.h \
+ $(INC)anydataobj.h \
  $(INC)nbmath.h
 $(OBJ)spheregorski.o: spheregorski.cc spheregorski.h sphericalmap.h \
@@ -73,11 +83,11 @@
  $(INC)md5.h \
  $(INC)dvlist.h \
- $(INC)cvector.h \
- $(INC)matrix.h \
- $(INC)peida.h \
- $(INC)utils.h \
- $(INC)perrors.h \
- $(INC)fmath.h \
- $(INC)strutil.h
+ $(INC)objfio.h \
+ $(INC)anydataobj.h \
+ $(INC)tvector.h \
+ $(INC)tmatrix.h \
+ $(INC)ndatablock.h \
+ $(INC)strutil.h \
+ $(INC)piocmplx.h
 $(OBJ)spherethetaphi.o: spherethetaphi.cc spherethetaphi.h sphericalmap.h \
  $(INC)nbmath.h \
@@ -88,12 +98,31 @@
  $(INC)md5.h \
  $(INC)dvlist.h \
- $(INC)cvector.h \
+ $(INC)objfio.h \
+ $(INC)anydataobj.h \
+ $(INC)tvector.h \
+ $(INC)tmatrix.h \
+ $(INC)ndatablock.h \
+ $(INC)piocmplx.h
+$(OBJ)syngen.o: syngen.cc syngen.h $(INC)cvector.h \
  $(INC)matrix.h \
  $(INC)peida.h \
+ $(INC)machdefs.h \
+ $(INC)pclassids.h \
  $(INC)utils.h \
  $(INC)perrors.h \
- $(INC)fmath.h pdataarray.h prefcount.h
+ $(INC)pexceptions.h \
+ $(INC)fmath.h \
+ $(INC)ppersist.h \
+ $(INC)md5.h sphericalmap.h \
+ $(INC)nbmath.h pixelmap.h \
+ $(INC)dvlist.h \
+ $(INC)objfio.h \
+ $(INC)anydataobj.h \
+ $(INC)tvector.h \
+ $(INC)tmatrix.h \
+ $(INC)ndatablock.h lambuilder.h \
+ $(INC)fftserver.h
 $(OBJ)unitvector.o: unitvector.cc unitvector.h vector3d.h longlat.h \
  utilgeom.h
-$(OBJ)utilgeom.o: utilgeom.cc
+$(OBJ)utilgeom.o: utilgeom.cc utilgeom.h
 $(OBJ)vector3d.o: vector3d.cc vector3d.h longlat.h utilgeom.h
