Fix C++ warnings, better cleaning in makefiles

[ctsim.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 4cbdfc62fd51280823cb10c728f41f4ca89022b7..b10273c09107c95793f6574b2999672977b1066b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -62,6 +62,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GREP = @GREP@
 HAVE_SGP_FALSE = @HAVE_SGP_FALSE@
 HAVE_SGP_TRUE = @HAVE_SGP_TRUE@
 HAVE_WXWINDOWS_FALSE = @HAVE_WXWINDOWS_FALSE@
@@ -99,6 +100,7 @@ USE_HTML_TRUE = @USE_HTML_TRUE@
 USE_LAM_FALSE = @USE_LAM_FALSE@
 USE_LAM_TRUE = @USE_LAM_TRUE@
 VERSION = @VERSION@
+XMKMF = @XMKMF@
 X_BASIC_LIBS = @X_BASIC_LIBS@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
@@ -107,8 +109,6 @@ X_PRE_LIBS = @X_PRE_LIBS@
 X_TOOLKIT_LIBS = @X_TOOLKIT_LIBS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -127,6 +127,9 @@ cgibinurl = @cgibinurl@
 cgiprograms = @cgiprograms@
 ctlibs = @ctlibs@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
@@ -143,13 +146,16 @@ lamdir = @lamdir@
 lamprograms = @lamprograms@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mpienable = @mpienable@
 my_includes = @my_includes@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -172,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
@@ -501,6 +509,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
        -rm -f $(CONFIG_CLEAN_FILES)
@@ -510,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)
@@ -558,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 \
@@ -574,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)