projects
/
ctsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
78a89de
)
r365: *** empty log message ***
author
Kevin M. Rosenberg
<kevin@rosenberg.net>
Mon, 8 Jan 2001 03:07:09 +0000
(
03:07
+0000)
committer
Kevin M. Rosenberg
<kevin@rosenberg.net>
Mon, 8 Jan 2001 03:07:09 +0000
(
03:07
+0000)
tools/Makefile.am
patch
|
blob
|
history
diff --git
a/tools/Makefile.am
b/tools/Makefile.am
index 0577039cfe0bb7cd3ed913820a20f57588642d1d..8c8e2160ab2ed2e93fe19e38c45cb1475e01a47b 100644
(file)
--- a/
tools/Makefile.am
+++ b/
tools/Makefile.am
@@
-1,6
+1,6
@@
-bin_PROGRAMS = pjrec phm2pj pj2if @lamprograms@ ifinfo phm2if if1 if2 ifexport pjinfo
ctsimtext
+bin_PROGRAMS = pjrec phm2pj pj2if @lamprograms@ ifinfo phm2if if1 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
@@
-38,9
+38,9
@@
ifinfo_SOURCES = ifinfo.cpp
ifinfo_LDADD=@ctlibs@
ifinfo_DEPENDENCIES=$(SOURCE_DEPEND)
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)
+
#
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@
pjrec_lam_SOURCES=pjrec.cpp
pjrec_lam_LDADD=@ctlamlibs@
@@
-49,6
+49,9
@@
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
realclean:
rm -f *.pgm *.if *~ *.pj
@@
-57,7
+60,7
@@
CC_LAM = $(lamdir)/bin/hcp
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
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 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@
+ $(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
$(CC_LAM) @DEFS@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI pjrec.cpp -o pjrec-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
pjrec-lam: pjrec.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
$(CC_LAM) @DEFS@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI pjrec.cpp -o pjrec-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@