Fix C++ warnings, better cleaning in makefiles

[ctsim.git] / tools / Makefile.am

diff --git a/tools/Makefile.am b/tools/Makefile.am
index e2146880e6ea42751ff68388514c334ca601b91a..49b82a99eefb450faf729e291be28718f9850ff5 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,5 +1,4 @@
 bin_PROGRAMS = @lamprograms@  ctsimtext 
-bin_SCRIPTS = sample-ctsim.sh
 EXTRA_PROGRAMS = ctsimtext-lam
 INCLUDES=@my_includes@
 
@@ -10,33 +9,26 @@ SOURCE_DEPEND=../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsuppor
 endif
 
 install-exec-hook:
-       rm -f $(bindir)/if1
-       rm -f $(bindir)/if2
-       rm -f $(bindir)/ifexport
-       rm -f $(bindir)/ifinfo
-       rm -f $(bindir)/phm2if
-       rm -f $(bindir)/phm2pj
-       rm -f $(bindir)/pj2if
-       rm -f $(bindir)/pjinfo
-       rm -f $(bindir)/pjrec
-       ln -s $(bindir)/ctsimtext $(bindir)/if1
-       ln -s $(bindir)/ctsimtext $(bindir)/if2
-       ln -s $(bindir)/ctsimtext $(bindir)/ifexport
-       ln -s $(bindir)/ctsimtext $(bindir)/ifinfo
-       ln -s $(bindir)/ctsimtext $(bindir)/phm2if
-       ln -s $(bindir)/ctsimtext $(bindir)/phm2pj
-       ln -s $(bindir)/ctsimtext $(bindir)/pj2if
-       ln -s $(bindir)/ctsimtext $(bindir)/pjinfo
-       ln -s $(bindir)/ctsimtext $(bindir)/pjrec
-
-ctsimtext_SOURCES = ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp nographics.cpp
+       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@
 ctsimtext_DEPENDENCIES=$(SOURCE_DEPEND)
 
-realclean:
-       rm -f *.pgm *.if *~ *.pj
+CLEANFILES=\*.pgm \*.if \*~ \*.pj sample-ctsim.sh
 
-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 
+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
@@ -45,7 +37,7 @@ LAM_EXTRA_SRC = mpiworld.cpp
 
 ctsimtext_lam_DEPENDENCIES=$(SOURCE_DEPEND)
 
-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
+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