Fix C++ warnings, better cleaning in makefiles

[ctsim.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index c12b66e78484841fdf78737cd0d6200347a79576..b10273c09107c95793f6574b2999672977b1066b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -178,6 +178,8 @@ wxlibs = @wxlibs@
 SUBDIRS = man libctsupport libctsim  html cgi-bin include $(EXTRA_DIRS1) $(EXTRA_DIRS2) $(EXTRA_DIRS3) tools helical
 
 EXTRA_DIST = acsite.m4 make.bat msvc/ctsim.dsw msvc/ctsimtext/ctsimtext.dsp msvc/libctsim/libctsim.dsp msvc/ctsim/ctsim.dsp
+
+CLEANFILES = docs/html/\* config.status configure.in
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -193,7 +195,7 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
 DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
        COPYING ChangeLog INSTALL Makefile.am NEWS TODO aclocal.m4 \
        config.guess config.h.in config.sub configure configure.ac \
-       configure.in depcomp install-sh missing mkinstalldirs
+       depcomp install-sh missing mkinstalldirs
 DIST_SUBDIRS = man libctsupport libctsim html cgi-bin include getopt \
        libctgraphics src tools helical
 all: config.h
@@ -507,6 +509,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
        -rm -f $(CONFIG_CLEAN_FILES)
@@ -516,7 +519,7 @@ maintainer-clean-generic:
        @echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-generic mostlyclean-am
+clean-am: clean-generic clean-local mostlyclean-am
 
 distclean: distclean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -564,8 +567,8 @@ uninstall-am: uninstall-info-am
 uninstall-info: uninstall-info-recursive
 
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-       clean-generic clean-recursive ctags ctags-recursive dist \
-       dist-all dist-gzip distcheck distclean distclean-generic \
+       clean-generic clean-local clean-recursive ctags ctags-recursive \
+       dist dist-all dist-gzip distcheck distclean distclean-generic \
        distclean-hdr distclean-recursive distclean-tags distcleancheck \
        distdir distuninstallcheck dvi dvi-am dvi-recursive info \
        info-am info-recursive install install-am install-data \
@@ -580,6 +583,8 @@ uninstall-info: uninstall-info-recursive
        ps-recursive tags tags-recursive uninstall uninstall-am \
        uninstall-info-am uninstall-info-recursive uninstall-recursive
 
+clean-local:
+       rm -rf docs/html
 
 #install-data-hook: 
 #      test -d $(datadir) || mkdir -p $(datadir) && chmod 0755 $(datadir)