projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r368: Additions to ctsimtext
[ctsim.git]
/
tools
/
Makefile.am
diff --git
a/tools/Makefile.am
b/tools/Makefile.am
index f724e539ef2c94f184356bcca747c0eb138c1d78..8c8e2160ab2ed2e93fe19e38c45cb1475e01a47b 100644
(file)
--- a/
tools/Makefile.am
+++ b/
tools/Makefile.am
@@
-1,6
+1,6
@@
-bin_PROGRAMS = pjrec phm2pj pj2if @lamprograms@ ifinfo phm2if if
-1 if-2 if2img
+bin_PROGRAMS = pjrec phm2pj pj2if @lamprograms@ ifinfo phm2if if
1 if2 ifexport pjinfo
bin_SCRIPTS = sample-ctsim.sh
bin_SCRIPTS = sample-ctsim.sh
-EXTRA_PROGRAMS = pjrec-lam phm2pj-lam phm2if-lam
+EXTRA_PROGRAMS = pjrec-lam phm2pj-lam phm2if-lam
ctsimtext ctsimtext-mpi
INCLUDES=@my_includes@
EXTRA_DIST=Makefile.nt mpiworld.cpp
INCLUDES=@my_includes@
EXTRA_DIST=Makefile.nt mpiworld.cpp
@@
-19,22
+19,29
@@
phm2pj_DEPENDENCIES=$(SOURCE_DEPEND)
phm2if_SOURCES = phm2if.cpp
phm2if_LDADD=@ctlibs@
phm2if_DEPENDENCIES=$(SOURCE_DEPEND)
phm2if_SOURCES = phm2if.cpp
phm2if_LDADD=@ctlibs@
phm2if_DEPENDENCIES=$(SOURCE_DEPEND)
-if
2img_SOURCES = if2img
.cpp
-if
2img
_LDADD=@ctlibs@
-if
2img
_DEPENDENCIES=$(SOURCE_DEPEND)
+if
export_SOURCES = ifexport
.cpp
+if
export
_LDADD=@ctlibs@
+if
export
_DEPENDENCIES=$(SOURCE_DEPEND)
pj2if_SOURCES = pj2if.cpp
pj2if_LDADD=@ctlibs@
pj2if_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)
+pjinfo_SOURCES = pjinfo.cpp
+pjinfo_LDADD=@ctlibs@
+pjinfo_DEPENDENCIES=$(SOURCE_DEPEND)
+if1_SOURCES=if1.cpp
+if1_LDADD=@ctlibs@
+if1_DEPENDENCIES=$(SOURCE_DEPEND)
+if2_SOURCES=if2.cpp
+if2_LDADD=@ctlibs@
+if2_DEPENDENCIES=$(SOURCE_DEPEND)
ifinfo_SOURCES = ifinfo.cpp
ifinfo_LDADD=@ctlibs@
ifinfo_DEPENDENCIES=$(SOURCE_DEPEND)
ifinfo_SOURCES = ifinfo.cpp
ifinfo_LDADD=@ctlibs@
ifinfo_DEPENDENCIES=$(SOURCE_DEPEND)
+#ctsimtext_SOURCES = ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp
+#ctsimtext_LDADD=@ctlibs@
+#ctsim_DEPENDENCIES=$(SOURCE_DEPEND)
+
pjrec_lam_SOURCES=pjrec.cpp
pjrec_lam_LDADD=@ctlamlibs@
phm2if_lam_SOURCES=phm2if.cpp
pjrec_lam_SOURCES=pjrec.cpp
pjrec_lam_LDADD=@ctlamlibs@
phm2if_lam_SOURCES=phm2if.cpp
@@
-42,18
+49,24
@@
phm2if_lam_LDADD=@ctlamlibs@
phm2pj_lam_SOURCES=phm2pj.cpp
phm2pj_lam_LDADD=@ctlamlibs@
phm2pj_lam_SOURCES=phm2pj.cpp
phm2pj_lam_LDADD=@ctlamlibs@
+ctsimtext: ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
+ $(CC) -DHAVE_CONFIG_H $(CFLAGS) $(INCLUDES) -DNO_MAIN ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp -o ctsimtext-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
+
realclean:
rm -f *.pgm *.if *~ *.pj
if USE_LAM
realclean:
rm -f *.pgm *.if *~ *.pj
if USE_LAM
-CC_LAM = $(lamdir)/bin/
balky
+CC_LAM = $(lamdir)/bin/
hcp
LAM_EXTRA_SRC = mpiworld.cpp
LAM_EXTRA_SRC = mpiworld.cpp
+ctsimtext-lam: ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
+ $(CC_LAM) @DEFS@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI -DNO_MAIN ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp -o ctsimtext-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
+
pjrec-lam: pjrec.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
pjrec-lam: pjrec.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
- $(CC_LAM) @DEF@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI pjrec.cpp -o pjrec-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
+ $(CC_LAM) @DEF
S
@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI pjrec.cpp -o pjrec-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
phm2pj-lam: phm2pj.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
phm2pj-lam: phm2pj.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
- $(CC_LAM) @DEF@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2pj.cpp -o phm2pj-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
+ $(CC_LAM) @DEF
S
@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2pj.cpp -o phm2pj-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
phm2if-lam: phm2if.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
$(CC_LAM) @DEFS@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2if.cpp -o phm2if-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
phm2if-lam: phm2if.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
$(CC_LAM) @DEFS@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2if.cpp -o phm2if-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@