Fix C++ warnings, better cleaning in makefiles

[ctsim.git] / tools / Makefile.am

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 0577039cfe0bb7cd3ed913820a20f57588642d1d..49b82a99eefb450faf729e291be28718f9850ff5 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,8 +1,6 @@
-bin_PROGRAMS = pjrec phm2pj pj2if @lamprograms@  ifinfo phm2if if1 if2 ifexport pjinfo ctsimtext
-bin_SCRIPTS = sample-ctsim.sh
-EXTRA_PROGRAMS = pjrec-lam phm2pj-lam phm2if-lam
+bin_PROGRAMS = @lamprograms@  ctsimtext 
+EXTRA_PROGRAMS = ctsimtext-lam
 INCLUDES=@my_includes@
-EXTRA_DIST=Makefile.nt mpiworld.cpp
 
 if HAVE_SGP
 SOURCE_DEPEND=../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a ../libctgraphics/libctgraphics.a
@@ -10,63 +8,37 @@ else
 SOURCE_DEPEND=../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
 endif
 
-pjrec_SOURCES = pjrec.cpp  
-pjrec_LDADD=@ctlibs@
-pjrec_DEPENDENCIES=$(SOURCE_DEPEND)
-phm2pj_SOURCES=phm2pj.cpp 
-phm2pj_LDADD=@ctlibs@
-phm2pj_DEPENDENCIES=$(SOURCE_DEPEND)
-phm2if_SOURCES = phm2if.cpp
-phm2if_LDADD=@ctlibs@
-phm2if_DEPENDENCIES=$(SOURCE_DEPEND)
-ifexport_SOURCES = ifexport.cpp
-ifexport_LDADD=@ctlibs@
-ifexport_DEPENDENCIES=$(SOURCE_DEPEND)
-pj2if_SOURCES = pj2if.cpp
-pj2if_LDADD=@ctlibs@
-pj2if_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)
-
-ctsimtext_SOURCES = ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp
+install-exec-hook:
+       ln -sf ctsimtext $(bindir)/if1
+       ln -sf ctsimtext $(bindir)/if2
+       ln -sf ctsimtext $(bindir)/ifexport
+       ln -sf ctsimtext $(bindir)/ifinfo
+       ln -sf ctsimtext $(bindir)/phm2if
+       ln -sf ctsimtext $(bindir)/phm2pj
+       ln -sf ctsimtext $(bindir)/phm2helix
+       ln -sf ctsimtext $(bindir)/pj2if
+       ln -sf ctsimtext $(bindir)/pjinfo
+       ln -sf ctsimtext $(bindir)/pjrec
+       ln -sf ctsimtext $(bindir)/pjHinterp
+       ln -sf ctsimtext $(bindir)/linogram
+
+ctsimtext_SOURCES = ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp nographics.cpp phm2helix.cpp pjHinterp.cpp linogram.cpp
 ctsimtext_LDADD=@ctlibs@
-ctsim_DEPENDENCIES=$(SOURCE_DEPEND)
+ctsimtext_DEPENDENCIES=$(SOURCE_DEPEND)
 
-pjrec_lam_SOURCES=pjrec.cpp
-pjrec_lam_LDADD=@ctlamlibs@
-phm2if_lam_SOURCES=phm2if.cpp
-phm2if_lam_LDADD=@ctlamlibs@
-phm2pj_lam_SOURCES=phm2pj.cpp
-phm2pj_lam_LDADD=@ctlamlibs@
+CLEANFILES=\*.pgm \*.if \*~ \*.pj sample-ctsim.sh
 
-realclean:
-       rm -f *.pgm *.if *~ *.pj
+ctsimtext_lam_SOURCES = ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp nographics.cpp mpiworld.cpp phm2helix.cpp pjHinterp.cpp linogram.cpp
+ctsimtext_lam_LDADD=@ctlamlibs@
 
 if USE_LAM
 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
-       $(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@
-
-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@
-
-phm2pj-lam: phm2pj.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
-       $(CC_LAM) @DEFS@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2pj.cpp -o phm2pj-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
+ctsimtext_lam_DEPENDENCIES=$(SOURCE_DEPEND)
 
-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@
+ctsimtext-lam$(EXEEXT): ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp mpiworld.cpp linogram.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@
 
 endif