X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2FMakefile.am;h=84201827da2d1a673ab846d9a4a3bb3ef23a0b4e;hp=ae3993856b0be392364102a39d5bd95793a3e54e;hb=2451ac413848718a1dd666ce6f6464e974680f47;hpb=59ff52843f44bec1ecd1ad36625cdda305cc7ef8

diff --git a/src/Makefile.am b/src/Makefile.am
index ae39938..8420182 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = ctsim ctrec phm2rs rs2if @lamprograms@  ifinfo phm2if if-1 if-2 i
 bin_SCRIPTS = sample-ctrec.sh
 EXTRA_PROGRAMS = ctrec-lam phm2rs-lam phm2if-lam
 INCLUDES=@my_includes@
-EXTRA_DIST=Makefile.nt
+EXTRA_DIST=Makefile.nt mpiworld.cpp
 
 ctsim_SOURCES = ctsim.cpp
 ctsim_LDADD = @ctlibs@
@@ -30,17 +30,21 @@ phm2if_lam_LDADD=@ctlamlibs@
 phm2rs_lam_SOURCES=phm2rs.cpp
 phm2rs_lam_LDADD=@ctlamlibs@
 
+realclean:
+	rm -f *.pgm *.if *~ *.rs
+
 if USE_LAM
 CC_LAM = $(lamdir)/bin/balky
+LAM_EXTRA_SRC = mpiworld.cpp
 
 ctrec-lam: ctrec.cpp
-	$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DMPI_CT ctrec.cpp -o ctrec-lam $(LDFLAGS) @ctlamlibs@
+	$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI ctrec.cpp -o ctrec-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
 
 phm2rs-lam: phm2rs.cpp
-	$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DMPI_CT phm2rs.cpp -o phm2rs-lam $(LDFLAGS) @ctlamlibs@
+	$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2rs.cpp -o phm2rs-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
 
 phm2if-lam: phm2if.cpp
-	$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DMPI_CT phm2if.cpp -o phm2if-lam $(LDFLAGS) @ctlamlibs@
+	$(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2if.cpp -o phm2if-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
 
 endif