projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r124: *** empty log message ***
[ctsim.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index e3e0bfe09715d1e4a669eff852b9c0078513d13a..616f189333405a165cdc87093324842912745555 100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1,61
+1,55
@@
-bin_PROGRAMS = ctsim
sdf2img ctrec phm2rs phm2sdf rs2sdf rs2if sdf-1 sdf-2 sdfinfo @lamprograms@ ifinfo phm2if if-1
-bin_SCRIPTS = sample-ct
rec
.sh
-EXTRA_PROGRAMS =
ctrec-lam phm2sdf-lam phm2rs
-lam phm2if-lam
+bin_PROGRAMS = ctsim
pjrec phm2pj pj2if @lamprograms@ ifinfo phm2if if-1 if-2 if2img
+bin_SCRIPTS = sample-ct
sim
.sh
+EXTRA_PROGRAMS =
pjrec-lam phm2pj
-lam phm2if-lam
INCLUDES=@my_includes@
INCLUDES=@my_includes@
-EXTRA_DIST=Makefile.nt
+EXTRA_DIST=Makefile.nt
mpiworld.cpp
ctsim_SOURCES = ctsim.cpp
ctsim_LDADD = @ctlibs@
ctsim_SOURCES = ctsim.cpp
ctsim_LDADD = @ctlibs@
-ctrec_SOURCES = ctrec.cpp
-ctrec_LDADD=@ctlibs@
-phm2rs_SOURCES=phm2rs.cpp
-phm2rs_LDADD=@ctlibs@
-phm2sdf_SOURCES = phm2sdf.cpp
-phm2sdf_LDADD=@ctlibs@
+pjrec_SOURCES = pjrec.cpp
+pjrec_LDADD=@ctlibs@
+phm2pj_SOURCES=phm2pj.cpp
+phm2pj_LDADD=@ctlibs@
phm2if_SOURCES = phm2if.cpp
phm2if_LDADD=@ctlibs@
phm2if_SOURCES = phm2if.cpp
phm2if_LDADD=@ctlibs@
-sdf2img_SOURCES = sdf2img.cpp
-sdf2img_LDADD=@ctlibs@
-rs2sdf_SOURCES = rs2sdf.cpp
-rs2sdf_LDADD=@ctlibs@
-rs2if_SOURCES = rs2if.cpp
-rs2if_LDADD=@ctlibs@
-sdf_1_SOURCES=sdf-1.cpp
-sdf_1_LDADD=@ctlibs@
+if2img_SOURCES = if2img.cpp
+if2img_LDADD=@ctlibs@
+pj2if_SOURCES = pj2if.cpp
+pj2if_LDADD=@ctlibs@
if_1_SOURCES=if-1.cpp
if_1_LDADD=@ctlibs@
if_1_SOURCES=if-1.cpp
if_1_LDADD=@ctlibs@
-sdf_2_SOURCES=sdf-2.cpp
-sdf_2_LDADD=@ctlibs@
-sdfinfo_SOURCES = sdfinfo.cpp
-sdfinfo_LDADD=@ctlibs@
+if_2_SOURCES=if-2.cpp
+if_2_LDADD=@ctlibs@
ifinfo_SOURCES = ifinfo.cpp
ifinfo_LDADD=@ctlibs@
ifinfo_SOURCES = ifinfo.cpp
ifinfo_LDADD=@ctlibs@
-ctrec_lam_SOURCES=ctrec.cpp
-ctrec_lam_LDADD=@ctlamlibs@
-phm2sdf_lam_SOURCES=phm2sdf.cpp
-phm2sdf_lam_LDADD=@ctlamlibs@
+pjrec_lam_SOURCES=pjrec.cpp
+pjrec_lam_LDADD=@ctlamlibs@
phm2if_lam_SOURCES=phm2if.cpp
phm2if_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 *~ *.pj
if USE_LAM
CC_LAM = $(lamdir)/bin/balky
if USE_LAM
CC_LAM = $(lamdir)/bin/balky
+LAM_EXTRA_SRC = mpiworld.cpp
-ctrec-lam: ctrec.cpp
- $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -D
MPI_CT ctrec.cpp -o ctrec-lam $(LDFLAGS) @ctlam
libs@
+pjrec-lam: pjrec.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
+ $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -D
HAVE_MPI pjrec.cpp -o pjrec-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ct
libs@
-phm2
sdf-lam: phm2sdf.cpp
- $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -D
MPI_CT phm2sdf.cpp -o phm2sdf-lam $(LDFLAGS) @ctlam
libs@
+phm2
pj-lam: phm2pj.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
+ $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -D
HAVE_MPI phm2pj.cpp -o phm2pj-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ct
libs@
-phm2
rs-lam: phm2rs.cpp
- $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -D
MPI_CT phm2rs.cpp -o phm2rs-lam $(LDFLAGS) @ctlam
libs@
+phm2
if-lam: phm2if.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
+ $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -D
HAVE_MPI phm2if.cpp -o phm2if-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ct
libs@
endif
endif
-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 phm2
rs.cpp phm2sdf.cpp sdf2img.cpp rs2sdf.cpp sdf-1.cpp sdf-2.cpp sdfinfo
.cpp @ctlibs@ $(LDFLAGS) -o ir.so
+shared:
pjrec.cpp phm2pj.cpp
+ $(CC) @DEFS@ $(CFLAGS) $(INCLUDES) -DNO_MAIN -shared phm2
pj.cpp pjrec
.cpp @ctlibs@ $(LDFLAGS) -o ir.so