X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2FMakefile.am;h=616f189333405a165cdc87093324842912745555;hb=949b7c917af311cd38f911bc5d0af36f524a6086;hp=42c90f2df277be70257fb77508f82d8cd466785d;hpb=5cf6874680f80d238bf34535d711dc223813f951;p=ctsim.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 42c90f2..616f189 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,13 +1,13 @@
-bin_PROGRAMS = ctsim ctrec phm2pj pj2if @lamprograms@  ifinfo phm2if if-1 if-2 if2img 
-bin_SCRIPTS = sample-ctrec.sh
-EXTRA_PROGRAMS = ctrec-lam phm2pj-lam phm2if-lam
+bin_PROGRAMS = ctsim pjrec phm2pj pj2if @lamprograms@  ifinfo phm2if if-1 if-2 if2img 
+bin_SCRIPTS = sample-ctsim.sh
+EXTRA_PROGRAMS = pjrec-lam phm2pj-lam phm2if-lam
 INCLUDES=@my_includes@
 EXTRA_DIST=Makefile.nt mpiworld.cpp
 
 ctsim_SOURCES = ctsim.cpp
 ctsim_LDADD = @ctlibs@
-ctrec_SOURCES = ctrec.cpp 
-ctrec_LDADD=@ctlibs@
+pjrec_SOURCES = pjrec.cpp 
+pjrec_LDADD=@ctlibs@
 phm2pj_SOURCES=phm2pj.cpp
 phm2pj_LDADD=@ctlibs@
 phm2if_SOURCES = phm2if.cpp
@@ -23,8 +23,8 @@ if_2_LDADD=@ctlibs@
 ifinfo_SOURCES = ifinfo.cpp
 ifinfo_LDADD=@ctlibs@
 
-ctrec_lam_SOURCES=ctrec.cpp
-ctrec_lam_LDADD=@ctlamlibs@
+pjrec_lam_SOURCES=pjrec.cpp
+pjrec_lam_LDADD=@ctlamlibs@
 phm2if_lam_SOURCES=phm2if.cpp
 phm2if_lam_LDADD=@ctlamlibs@
 phm2pj_lam_SOURCES=phm2pj.cpp
@@ -37,19 +37,19 @@ if USE_LAM
 CC_LAM = $(lamdir)/bin/balky
 LAM_EXTRA_SRC = mpiworld.cpp
 
-ctrec-lam: ctrec.cpp mpiworld.cpp ../include/ct.h  ../libctsim/libctsim.a ../libctsupport/libctsupport.a
-	$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI ctrec.cpp -o ctrec-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
+pjrec-lam: pjrec.cpp mpiworld.cpp ../include/ct.h  ../libctsim/libctsim.a ../libctsupport/libctsupport.a
+	$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI pjrec.cpp -o pjrec-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
 
-phm2pj-lam: phm2pj.cpp mpiworld.cpp ../include/ct.h
+phm2pj-lam: phm2pj.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
 	$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2pj.cpp -o phm2pj-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
 
-phm2if-lam: phm2if.cpp mpiworld.cpp ../include/ct.h
+phm2if-lam: phm2if.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
 	$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2if.cpp -o phm2if-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
 
 endif
 
-shared: ctrec.cpp phm2pj.cpp 
-	$(CC) @DEFS@ $(CFLAGS) $(INCLUDES) -DNO_MAIN -shared phm2pj.cpp ctrec.cpp @ctlibs@ $(LDFLAGS) -o ir.so
+shared: pjrec.cpp phm2pj.cpp 
+	$(CC) @DEFS@ $(CFLAGS) $(INCLUDES) -DNO_MAIN -shared phm2pj.cpp pjrec.cpp @ctlibs@ $(LDFLAGS) -o ir.so