projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r303: *** empty log message ***
[ctsim.git]
/
tools
/
Makefile.am
diff --git
a/tools/Makefile.am
b/tools/Makefile.am
index 02edc5901a91466ad64c40f58a3bd8a6319d3d58..ca8ef64eadcb43585118654100128523b4c69633 100644
(file)
--- a/
tools/Makefile.am
+++ b/
tools/Makefile.am
@@
-1,4
+1,4
@@
-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
EXTRA_PROGRAMS = pjrec-lam phm2pj-lam phm2if-lam
INCLUDES=@my_includes@
bin_SCRIPTS = sample-ctsim.sh
EXTRA_PROGRAMS = pjrec-lam phm2pj-lam phm2if-lam
INCLUDES=@my_includes@
@@
-19,18
+19,21
@@
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)
@@
-46,22
+49,19
@@
realclean:
rm -f *.pgm *.if *~ *.pj
if USE_LAM
rm -f *.pgm *.if *~ *.pj
if USE_LAM
-CC_LAM = $(lamdir)/bin/
balky
+CC_LAM = $(lamdir)/bin/
hcp
LAM_EXTRA_SRC = mpiworld.cpp
pjrec-lam: pjrec.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
LAM_EXTRA_SRC = mpiworld.cpp
pjrec-lam: pjrec.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
- $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI pjrec.cpp -o pjrec-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
+ $(CC_LAM) @DEFS@
@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) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2pj.cpp -o phm2pj-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
+ $(CC_LAM) @DEFS@
@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
phm2if-lam: phm2if.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
- $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2if.cpp -o phm2if-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
+ $(CC_LAM) @DEFS@
@lamdefs@
$(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2if.cpp -o phm2if-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
endif
endif
-shared: pjrec.cpp phm2pj.cpp
- $(CC) @DEFS@ $(CFLAGS) $(INCLUDES) -DNO_MAIN -shared phm2pj.cpp pjrec.cpp @ctlibs@ $(LDFLAGS) -o ir.so
-