projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r83: Converted to IF data files and C++
[ctsim.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index e3e0bfe09715d1e4a669eff852b9c0078513d13a..ae3993856b0be392364102a39d5bd95793a3e54e 100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1,6
+1,6
@@
-bin_PROGRAMS = ctsim
sdf2img ctrec phm2rs phm2sdf rs2sdf rs2if sdf-1 sdf-2 sdfinfo @lamprograms@ ifinfo phm2if if-1
+bin_PROGRAMS = ctsim
ctrec phm2rs rs2if @lamprograms@ ifinfo phm2if if-1 if-2 if2img
bin_SCRIPTS = sample-ctrec.sh
bin_SCRIPTS = sample-ctrec.sh
-EXTRA_PROGRAMS = ctrec-lam phm2
sdf-lam phm2
rs-lam phm2if-lam
+EXTRA_PROGRAMS = ctrec-lam phm2rs-lam phm2if-lam
INCLUDES=@my_includes@
EXTRA_DIST=Makefile.nt
INCLUDES=@my_includes@
EXTRA_DIST=Makefile.nt
@@
-10,31
+10,21
@@
ctrec_SOURCES = ctrec.cpp
ctrec_LDADD=@ctlibs@
phm2rs_SOURCES=phm2rs.cpp
phm2rs_LDADD=@ctlibs@
ctrec_LDADD=@ctlibs@
phm2rs_SOURCES=phm2rs.cpp
phm2rs_LDADD=@ctlibs@
-phm2sdf_SOURCES = phm2sdf.cpp
-phm2sdf_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@
+if2img_SOURCES = if2img.cpp
+if2img_LDADD=@ctlibs@
rs2if_SOURCES = rs2if.cpp
rs2if_LDADD=@ctlibs@
rs2if_SOURCES = rs2if.cpp
rs2if_LDADD=@ctlibs@
-sdf_1_SOURCES=sdf-1.cpp
-sdf_1_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@
ctrec_lam_SOURCES=ctrec.cpp
ctrec_lam_LDADD=@ctlamlibs@
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@
phm2if_lam_SOURCES=phm2if.cpp
phm2if_lam_LDADD=@ctlamlibs@
phm2rs_lam_SOURCES=phm2rs.cpp
phm2if_lam_SOURCES=phm2if.cpp
phm2if_lam_LDADD=@ctlamlibs@
phm2rs_lam_SOURCES=phm2rs.cpp
@@
-46,16
+36,16
@@
CC_LAM = $(lamdir)/bin/balky
ctrec-lam: ctrec.cpp
$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DMPI_CT ctrec.cpp -o ctrec-lam $(LDFLAGS) @ctlamlibs@
ctrec-lam: ctrec.cpp
$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DMPI_CT ctrec.cpp -o ctrec-lam $(LDFLAGS) @ctlamlibs@
-phm2sdf-lam: phm2sdf.cpp
- $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DMPI_CT phm2sdf.cpp -o phm2sdf-lam $(LDFLAGS) @ctlamlibs@
-
phm2rs-lam: phm2rs.cpp
$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DMPI_CT phm2rs.cpp -o phm2rs-lam $(LDFLAGS) @ctlamlibs@
phm2rs-lam: phm2rs.cpp
$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DMPI_CT phm2rs.cpp -o phm2rs-lam $(LDFLAGS) @ctlamlibs@
+phm2if-lam: phm2if.cpp
+ $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DMPI_CT phm2if.cpp -o phm2if-lam $(LDFLAGS) @ctlamlibs@
+
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 phm2rs.cpp
phm2sdf.cpp sdf2img.cpp rs2sdf.cpp sdf-1.cpp sdf-2.cpp sdfinfo
.cpp @ctlibs@ $(LDFLAGS) -o ir.so
+shared: ctrec.cpp phm2rs.cpp
+ $(CC) @DEFS@ $(CFLAGS) $(INCLUDES) -DNO_MAIN -shared phm2rs.cpp
ctrec
.cpp @ctlibs@ $(LDFLAGS) -o ir.so