Fix C++ warnings, better cleaning in makefiles

[ctsim.git] / tools / Makefile.in

diff --git a/tools/Makefile.in b/tools/Makefile.in
index d503edd8a802f855f315be830888a96251e220d3..99e3f4f98cce695923dbb144914e0c24fd87ed9f 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -177,6 +177,8 @@ ctsimtext_SOURCES = ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if
 ctsimtext_LDADD = @ctlibs@
 ctsimtext_DEPENDENCIES = $(SOURCE_DEPEND)
 
+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 phm2helix.cpp pjHinterp.cpp linogram.cpp
 ctsimtext_lam_LDADD = @ctlamlibs@
 
@@ -424,6 +426,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
        -rm -f $(CONFIG_CLEAN_FILES)
@@ -506,9 +509,6 @@ install-exec-hook:
        ln -sf ctsimtext $(bindir)/pjHinterp
        ln -sf ctsimtext $(bindir)/linogram
 
-realclean:
-       rm -f *.pgm *.if *~ *.pj
-
 @USE_LAM_TRUE@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
 @USE_LAM_TRUE@ $(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@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.