projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r100: moved files
[ctsim.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index 61ef42b355a3d0eb3011ab7ccf40ce588c9b9222..c6d233978d797544bdbfeab2ae01c20848d5683e 100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1,21
+1,21
@@
-bin_PROGRAMS = ctsim ctrec phm2
rs rs
2if @lamprograms@ ifinfo phm2if if-1 if-2 if2img
+bin_PROGRAMS = ctsim ctrec phm2
pj pj
2if @lamprograms@ ifinfo phm2if if-1 if-2 if2img
bin_SCRIPTS = sample-ctrec.sh
bin_SCRIPTS = sample-ctrec.sh
-EXTRA_PROGRAMS = ctrec-lam phm2
rs
-lam phm2if-lam
+EXTRA_PROGRAMS = ctrec-lam phm2
pj
-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@
ctrec_SOURCES = ctrec.cpp
ctrec_LDADD=@ctlibs@
ctsim_SOURCES = ctsim.cpp
ctsim_LDADD = @ctlibs@
ctrec_SOURCES = ctrec.cpp
ctrec_LDADD=@ctlibs@
-phm2
rs_SOURCES=phm2rs
.cpp
-phm2
rs
_LDADD=@ctlibs@
+phm2
pj_SOURCES=phm2pj
.cpp
+phm2
pj
_LDADD=@ctlibs@
phm2if_SOURCES = phm2if.cpp
phm2if_LDADD=@ctlibs@
if2img_SOURCES = if2img.cpp
if2img_LDADD=@ctlibs@
phm2if_SOURCES = phm2if.cpp
phm2if_LDADD=@ctlibs@
if2img_SOURCES = if2img.cpp
if2img_LDADD=@ctlibs@
-
rs2if_SOURCES = rs
2if.cpp
-
rs
2if_LDADD=@ctlibs@
+
pj2if_SOURCES = pj
2if.cpp
+
pj
2if_LDADD=@ctlibs@
if_1_SOURCES=if-1.cpp
if_1_LDADD=@ctlibs@
if_2_SOURCES=if-2.cpp
if_1_SOURCES=if-1.cpp
if_1_LDADD=@ctlibs@
if_2_SOURCES=if-2.cpp
@@
-27,26
+27,29
@@
ctrec_lam_SOURCES=ctrec.cpp
ctrec_lam_LDADD=@ctlamlibs@
phm2if_lam_SOURCES=phm2if.cpp
phm2if_lam_LDADD=@ctlamlibs@
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 *~ *.pj
if USE_LAM
CC_LAM = $(lamdir)/bin/balky
if USE_LAM
CC_LAM = $(lamdir)/bin/balky
-LAM_EXTRA_SRC =
../libir/mpi_ct
.cpp
+LAM_EXTRA_SRC =
mpiworld
.cpp
-ctrec-lam: ctrec.cpp
+ctrec-lam: ctrec.cpp
mpiworld.cpp ../include/ct.h
$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI ctrec.cpp -o ctrec-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI ctrec.cpp -o ctrec-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
-phm2
rs-lam: phm2rs.cpp
- $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2
rs.cpp -o phm2rs
-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
+phm2
pj-lam: phm2pj.cpp mpiworld.cpp ../include/ct.h
+ $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2
pj.cpp -o phm2pj
-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
-phm2if-lam: phm2if.cpp
+phm2if-lam: phm2if.cpp
mpiworld.cpp ../include/ct.h
$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2if.cpp -o phm2if-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
endif
$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2if.cpp -o phm2if-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
endif
-shared: ctrec.cpp phm2
rs
.cpp
- $(CC) @DEFS@ $(CFLAGS) $(INCLUDES) -DNO_MAIN -shared phm2
rs
.cpp ctrec.cpp @ctlibs@ $(LDFLAGS) -o ir.so
+shared: ctrec.cpp phm2
pj
.cpp
+ $(CC) @DEFS@ $(CFLAGS) $(INCLUDES) -DNO_MAIN -shared phm2
pj
.cpp ctrec.cpp @ctlibs@ $(LDFLAGS) -o ir.so