X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2FMakefile.am;h=203ab187997d24c6e1607e0de169d7d98dd6988a;hb=30e455abcd8cac05ce7afe43216ec9e26342e1cf;hp=624aa9136ebf86907430473e39ac1c100cc42457;hpb=931d1a7f12bb4ec7895c4b1300bd7df2ce758497;p=ctsim.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 624aa91..203ab18 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,51 +1,63 @@
-bin_PROGRAMS = ctsim sdf2img ctrec phm2rs phm2sdf rs2sdf sdf-1 sdf-2 sdfinfo @lamprograms@ 
-bin_SCRIPTS = sample-ctrec.sh
-EXTRA_PROGRAMS = ctrec-lam phm2sdf-lam phm2rs-lam
+SUBDIRS = ctsim
+bin_PROGRAMS = 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
-
-ctsim_SOURCES = ctsim.cpp
-ctsim_LDADD = @ctlibs@
-ctrec_SOURCES = ctrec.c 
-ctrec_LDADD=@ctlibs@
-phm2rs_SOURCES=phm2rs.c
-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
-ctrec_lam_LDADD=@ctlamlibs@
-phm2sdf_lam_SOURCES=phm2sdf.c
-phm2sdf_lam_LDADD=@ctlamlibs@
-phm2rs_lam_SOURCES=phm2rs.c
-phm2rs_lam_LDADD=@ctlamlibs@
+EXTRA_DIST=Makefile.nt mpiworld.cpp
+SOURCE_DEPEND=../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a ../libctgraphics/libctgraphics.a
+
+pjrec_SOURCES = pjrec.cpp  
+pjrec_LDADD=@ctlibs@
+pjrec_DEPENDENCIES=$(SOURCE_DEPEND)
+phm2pj_SOURCES=phm2pj.cpp 
+phm2pj_LDADD=@ctlibs@
+phm2pj_DEPENDENCIES=$(SOURCE_DEPEND)
+phm2if_SOURCES = phm2if.cpp
+phm2if_LDADD=@ctlibs@
+phm2if_DEPENDENCIES=$(SOURCE_DEPEND)
+if2img_SOURCES = if2img.cpp
+if2img_LDADD=@ctlibs@
+if2img_DEPENDENCIES=$(SOURCE_DEPEND)
+pj2if_SOURCES = pj2if.cpp
+pj2if_LDADD=@ctlibs@
+pj2if_DEPENDENCIES=$(SOURCE_DEPEND)
+if_1_SOURCES=if-1.cpp 
+if_1_LDADD=@ctlibs@
+if_1_DEPENDENCIES=$(SOURCE_DEPEND)
+if_2_SOURCES=if-2.cpp 
+if_2_LDADD=@ctlibs@
+if_2_DEPENDENCIES=$(SOURCE_DEPEND)
+ifinfo_SOURCES = ifinfo.cpp
+ifinfo_LDADD=@ctlibs@
+ifinfo_DEPENDENCIES=$(SOURCE_DEPEND)
+
+pjrec_lam_SOURCES=pjrec.cpp
+pjrec_lam_LDADD=@ctlamlibs@
+phm2if_lam_SOURCES=phm2if.cpp
+phm2if_lam_LDADD=@ctlamlibs@
+phm2pj_lam_SOURCES=phm2pj.cpp
+phm2pj_lam_LDADD=@ctlamlibs@
+
+realclean:
+	rm -f *.pgm *.if *~ *.pj
 
 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@
+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@
 
-phm2sdf-lam: phm2sdf.c
-	$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DMPI_CT phm2sdf.c -o phm2sdf-lam $(LDFLAGS) @ctlamlibs@
+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@
 
-phm2rs-lam: phm2rs.c
-	$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DMPI_CT phm2rs.c -o phm2rs-lam $(LDFLAGS) @ctlamlibs@
+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.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: pjrec.cpp phm2pj.cpp 
+	$(CC) @DEFS@ $(CFLAGS) $(INCLUDES) -DNO_MAIN -shared phm2pj.cpp pjrec.cpp @ctlibs@ $(LDFLAGS) -o ir.so