X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2FMakefile.am;h=84201827da2d1a673ab846d9a4a3bb3ef23a0b4e;hp=070099d999b7d9f1f0da667027b13e842c31c1a5;hb=2451ac413848718a1dd666ce6f6464e974680f47;hpb=c50886476dddf65aa71d519509b42f71303a149a

diff --git a/src/Makefile.am b/src/Makefile.am
index 070099d..8420182 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,47 +1,55 @@
-bin_PROGRAMS = sdf2img ctrec phm2rs phm2sdf rs2sdf sdf-1 sdf-2 sdfinfo @lamprograms@
+bin_PROGRAMS = ctsim ctrec phm2rs rs2if @lamprograms@  ifinfo phm2if if-1 if-2 if2img 
 bin_SCRIPTS = sample-ctrec.sh
-EXTRA_PROGRAMS = ctrec-lam phm2sdf-lam phm2rs-lam
+EXTRA_PROGRAMS = ctrec-lam phm2rs-lam phm2if-lam
 INCLUDES=@my_includes@
-EXTRA_DIST=Makefile.nt
+EXTRA_DIST=Makefile.nt mpiworld.cpp
 
-ctrec_SOURCES = ctrec.c 
+ctsim_SOURCES = ctsim.cpp
+ctsim_LDADD = @ctlibs@
+ctrec_SOURCES = ctrec.cpp 
 ctrec_LDADD=@ctlibs@
-phm2rs_SOURCES=phm2rs.c
+phm2rs_SOURCES=phm2rs.cpp
 phm2rs_LDADD=@ctlibs@
-phm2sdf_SOURCES = phm2sdf.c
-phm2sdf_LDADD=@ctlibs@
-sdf2img_SOURCES = sdf2img.c
-sdf2img_LDADD=@ctlibs@
-rs2sdf_SOURCES = rs2sdf.c
-rs2sdf_LDADD=@ctlibs@
-sdf_1_SOURCES=sdf-1.c
-sdf_1_LDADD=@ctlibs@
-sdf_2_SOURCES=sdf-2.c
-sdf_2_LDADD=@ctlibs@
-sdfinfo_SOURCES = sdfinfo.c 
-sdfinfo_LDADD=@ctlibs@
-
-ctrec_lam_SOURCES=ctrec.c
+phm2if_SOURCES = phm2if.cpp
+phm2if_LDADD=@ctlibs@
+if2img_SOURCES = if2img.cpp
+if2img_LDADD=@ctlibs@
+rs2if_SOURCES = rs2if.cpp
+rs2if_LDADD=@ctlibs@
+if_1_SOURCES=if-1.cpp
+if_1_LDADD=@ctlibs@
+if_2_SOURCES=if-2.cpp
+if_2_LDADD=@ctlibs@
+ifinfo_SOURCES = ifinfo.cpp
+ifinfo_LDADD=@ctlibs@
+
+ctrec_lam_SOURCES=ctrec.cpp
 ctrec_lam_LDADD=@ctlamlibs@
-phm2sdf_lam_SOURCES=phm2sdf.c
-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@
 
+realclean:
+	rm -f *.pgm *.if *~ *.rs
+
 if USE_LAM
-CC_LAM = $(lamdir)/bin/hcc
+CC_LAM = $(lamdir)/bin/balky
+LAM_EXTRA_SRC = mpiworld.cpp
 
-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) -DHAVE_MPI ctrec.cpp -o ctrec-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
 
-phm2sdf-lam: phm2sdf.c
-	$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DMPI_CT phm2sdf.c -o phm2sdf-lam $(LDFLAGS) @ctlamlibs@
+phm2rs-lam: phm2rs.cpp
+	$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2rs.cpp -o phm2rs-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
 
-phm2rs-lam: phm2rs.c
-	$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DMPI_CT phm2rs.c -o phm2rs-lam $(LDFLAGS) @ctlamlibs@
+phm2if-lam: phm2if.cpp
+	$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2if.cpp -o phm2if-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
 
 endif
 
+shared: ctrec.cpp phm2rs.cpp 
+	$(CC) @DEFS@ $(CFLAGS) $(INCLUDES) -DNO_MAIN -shared phm2rs.cpp ctrec.cpp @ctlibs@ $(LDFLAGS) -o ir.so