X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2FMakefile.am;h=ec47a605b00504cfb06a50ed4c2b15fa13905c4a;hp=7fda6a48176f3243b132345e0547066d16a43fc1;hb=f4a23943110823118f35756dd41fbd6707f04511;hpb=b5857e74e5735455b5ef11cbea5044ae7b2e8a0d

diff --git a/src/Makefile.am b/src/Makefile.am
index 7fda6a4..ec47a60 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
-bin_PROGRAMS = ctsim ctrec phm2rs rs2if @lamprograms@  ifinfo phm2if if-1 if-2 if2img 
+bin_PROGRAMS = ctsim ctrec phm2pj pj2if @lamprograms@  ifinfo phm2if if-1 if-2 if2img 
 bin_SCRIPTS = sample-ctrec.sh
-EXTRA_PROGRAMS = ctrec-lam phm2rs-lam phm2if-lam
+EXTRA_PROGRAMS = ctrec-lam phm2pj-lam phm2if-lam
 INCLUDES=@my_includes@
 EXTRA_DIST=Makefile.nt mpiworld.cpp
 
@@ -8,14 +8,14 @@ ctsim_SOURCES = ctsim.cpp
 ctsim_LDADD = @ctlibs@
 ctrec_SOURCES = ctrec.cpp 
 ctrec_LDADD=@ctlibs@
-phm2rs_SOURCES=phm2rs.cpp
-phm2rs_LDADD=@ctlibs@
+phm2pj_SOURCES=phm2pj.cpp
+phm2pj_LDADD=@ctlibs@
 phm2if_SOURCES = phm2if.cpp
 phm2if_LDADD=@ctlibs@
 if2img_SOURCES = if2img.cpp
 if2img_LDADD=@ctlibs@
-rs2if_SOURCES = rs2if.cpp
-rs2if_LDADD=@ctlibs@
+pj2if_SOURCES = pj2if.cpp
+pj2if_LDADD=@ctlibs@
 if_1_SOURCES=if-1.cpp
 if_1_LDADD=@ctlibs@
 if_2_SOURCES=if-2.cpp
@@ -27,11 +27,11 @@ ctrec_lam_SOURCES=ctrec.cpp
 ctrec_lam_LDADD=@ctlamlibs@
 phm2if_lam_SOURCES=phm2if.cpp
 phm2if_lam_LDADD=@ctlamlibs@
-phm2rs_lam_SOURCES=phm2rs.cpp
-phm2rs_lam_LDADD=@ctlamlibs@
+phm2pj_lam_SOURCES=phm2pj.cpp
+phm2pj_lam_LDADD=@ctlamlibs@
 
 realclean:
-	rm -f *.pgm *.if *~ *.rs
+	rm -f *.pgm *.if *~ *.pj
 
 if USE_LAM
 CC_LAM = $(lamdir)/bin/balky
@@ -40,16 +40,16 @@ LAM_EXTRA_SRC = mpiworld.cpp
 ctrec-lam: ctrec.cpp mpiworld.cpp
 	$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI ctrec.cpp -o ctrec-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
 
-phm2rs-lam: phm2rs.cpp mpiworld.cpp
-	$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2rs.cpp -o phm2rs-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
+phm2pj-lam: phm2pj.cpp mpiworld.cpp
+	$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2pj.cpp -o phm2pj-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
 
 phm2if-lam: phm2if.cpp mpiworld.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
+shared: ctrec.cpp phm2pj.cpp 
+	$(CC) @DEFS@ $(CFLAGS) $(INCLUDES) -DNO_MAIN -shared phm2pj.cpp ctrec.cpp @ctlibs@ $(LDFLAGS) -o ir.so