r74: *** empty log message ***

diff --git a/src/Makefile.am b/src/Makefile.am
index 624aa9136ebf86907430473e39ac1c100cc42457..e3e0bfe09715d1e4a669eff852b9c0078513d13a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,51 +1,61 @@
-bin_PROGRAMS = ctsim sdf2img ctrec phm2rs phm2sdf rs2sdf sdf-1 sdf-2 sdfinfo @lamprograms@ 
+bin_PROGRAMS = ctsim sdf2img ctrec phm2rs phm2sdf rs2sdf rs2if sdf-1 sdf-2 sdfinfo @lamprograms@  ifinfo phm2if if-1
 bin_SCRIPTS = sample-ctrec.sh
-EXTRA_PROGRAMS = ctrec-lam phm2sdf-lam phm2rs-lam
+EXTRA_PROGRAMS = ctrec-lam phm2sdf-lam phm2rs-lam phm2if-lam
 INCLUDES=@my_includes@
 EXTRA_DIST=Makefile.nt
 
 ctsim_SOURCES = ctsim.cpp
 ctsim_LDADD = @ctlibs@
-ctrec_SOURCES = ctrec.c 
+ctrec_SOURCES = ctrec.cpp 
 ctrec_LDADD=@ctlibs@
-phm2rs_SOURCES=phm2rs.c
+phm2rs_SOURCES=phm2rs.cpp
 phm2rs_LDADD=@ctlibs@
-phm2sdf_SOURCES = phm2sdf.c
+phm2sdf_SOURCES = phm2sdf.cpp
 phm2sdf_LDADD=@ctlibs@
-sdf2img_SOURCES = sdf2img.c
+phm2if_SOURCES = phm2if.cpp
+phm2if_LDADD=@ctlibs@
+sdf2img_SOURCES = sdf2img.cpp
 sdf2img_LDADD=@ctlibs@
-rs2sdf_SOURCES = rs2sdf.c
+rs2sdf_SOURCES = rs2sdf.cpp
 rs2sdf_LDADD=@ctlibs@
-sdf_1_SOURCES=sdf-1.c
+rs2if_SOURCES = rs2if.cpp
+rs2if_LDADD=@ctlibs@
+sdf_1_SOURCES=sdf-1.cpp
 sdf_1_LDADD=@ctlibs@
-sdf_2_SOURCES=sdf-2.c
+if_1_SOURCES=if-1.cpp
+if_1_LDADD=@ctlibs@
+sdf_2_SOURCES=sdf-2.cpp
 sdf_2_LDADD=@ctlibs@
-sdfinfo_SOURCES = sdfinfo.c 
+sdfinfo_SOURCES = sdfinfo.cpp
 sdfinfo_LDADD=@ctlibs@
+ifinfo_SOURCES = ifinfo.cpp
+ifinfo_LDADD=@ctlibs@
 
-ctrec_lam_SOURCES=ctrec.c
+ctrec_lam_SOURCES=ctrec.cpp
 ctrec_lam_LDADD=@ctlamlibs@
-phm2sdf_lam_SOURCES=phm2sdf.c
+phm2sdf_lam_SOURCES=phm2sdf.cpp
 phm2sdf_lam_LDADD=@ctlamlibs@
-phm2rs_lam_SOURCES=phm2rs.c
+phm2if_lam_SOURCES=phm2if.cpp
+phm2if_lam_LDADD=@ctlamlibs@
+phm2rs_lam_SOURCES=phm2rs.cpp
 phm2rs_lam_LDADD=@ctlamlibs@
 
 if USE_LAM
-CC_LAM = $(lamdir)/bin/hcc
+CC_LAM = $(lamdir)/bin/balky
 
-ctrec-lam: ctrec.c
-       $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DMPI_CT ctrec.c -o ctrec-lam $(LDFLAGS) @ctlamlibs@
+ctrec-lam: ctrec.cpp
+       $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DMPI_CT ctrec.cpp -o ctrec-lam $(LDFLAGS) @ctlamlibs@
 
-phm2sdf-lam: phm2sdf.c
-       $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DMPI_CT phm2sdf.c -o phm2sdf-lam $(LDFLAGS) @ctlamlibs@
+phm2sdf-lam: phm2sdf.cpp
+       $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DMPI_CT phm2sdf.cpp -o phm2sdf-lam $(LDFLAGS) @ctlamlibs@
 
-phm2rs-lam: phm2rs.c
-       $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DMPI_CT phm2rs.c -o phm2rs-lam $(LDFLAGS) @ctlamlibs@
+phm2rs-lam: phm2rs.cpp
+       $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DMPI_CT phm2rs.cpp -o phm2rs-lam $(LDFLAGS) @ctlamlibs@
 
 endif
 
-shared: ctrec.c phm2rs.c phm2sdf.c sdf2img.c rs2sdf.c sdf-1.c sdf-2.c sdfinfo.c
-       $(CC) @DEFS@ $(CFLAGS) $(INCLUDES) -DNO_MAIN -shared phm2rs.c phm2sdf.c sdf2img.c rs2sdf.c sdf-1.c sdf-2.c sdfinfo.c @ctlibs@ $(LDFLAGS) -o ir.so
+shared: ctrec.cpp phm2rs.cpp phm2sdf.cpp sdf2img.cpp rs2sdf.cpp  sdf-2.cpp sdf-1.cpp sdfinfo.cpp
+       $(CC) @DEFS@ $(CFLAGS) $(INCLUDES) -DNO_MAIN -shared phm2rs.cpp phm2sdf.cpp sdf2img.cpp rs2sdf.cpp sdf-1.cpp sdf-2.cpp sdfinfo.cpp @ctlibs@ $(LDFLAGS) -o ir.so
 
 
 

diff --git a/src/Makefile.nt b/src/Makefile.nt
index c1dbca9032c512ac9bb0db9da69b9f585fdafd98..cbfe390ee7660a17e34923317fa6cb95a4c6ff3d 100644 (file)
--- a/src/Makefile.nt
+++ b/src/Makefile.nt
@@ -17,6 +17,10 @@ all:  ctrec.exe phm2rs.exe phm2sdf.exe rs2sdf.exe sdf-1.exe sdf-2.exe sdf2img.ex
        $(CC) -c $(cvarsdll) $(CFLAGS) $*.c\r
 \r
 \r
+.obj: .cpp\r
+       $(CC) -c $(cvarsdll) $(CFLAGS) $*.cpp\r
+\r
+\r
 ctrec.exe: ctrec.obj\r
         link ctrec.obj  $(LDFLAGS)\r
 \r