r10662: new upstream: 4.4.0. Changes to support X.org

[ctsim.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 28cab2c8dca8f59bc02b310b4c31ef317fccea41..4cbdfc62fd51280823cb10c728f41f4ca89022b7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -162,12 +162,12 @@ wxconfig = @wxconfig@
 wxlibs = @wxlibs@
 @INCLUDED_GETOPT_LONG_TRUE@EXTRA_DIRS1 = getopt
 @INCLUDED_GETOPT_LONG_FALSE@EXTRA_DIRS1 = 
-@HAVE_SGP_FALSE@EXTRA_DIRS2 = 
 
 @HAVE_SGP_TRUE@EXTRA_DIRS2 = libctgraphics
-@HAVE_WXWINDOWS_FALSE@EXTRA_DIRS3 = 
+@HAVE_SGP_FALSE@EXTRA_DIRS2 = 
 
 @HAVE_WXWINDOWS_TRUE@EXTRA_DIRS3 = src
+@HAVE_WXWINDOWS_FALSE@EXTRA_DIRS3 = 
 
 SUBDIRS = man libctsupport libctsim  html cgi-bin include $(EXTRA_DIRS1) $(EXTRA_DIRS2) $(EXTRA_DIRS3) tools helical
 
@@ -184,10 +184,10 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
        all-recursive install-data-recursive install-exec-recursive \
        installdirs-recursive install-recursive uninstall-recursive \
        check-recursive installcheck-recursive
-DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-       Makefile.in NEWS TODO aclocal.m4 config.guess config.h.in \
-       config.sub configure configure.ac depcomp install-sh missing \
-       mkinstalldirs
+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 \
+       depcomp install-sh missing mkinstalldirs
 DIST_SUBDIRS = man libctsupport libctsim html cgi-bin include getopt \
        libctgraphics src tools helical
 all: config.h
@@ -495,7 +495,7 @@ install-am: all-am
 installcheck: installcheck-recursive
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         INSTALL_STRIP_FLAG=-s \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
          `test -z '$(STRIP)' || \
            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -503,7 +503,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
+       -rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@ -514,6 +514,7 @@ clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+       -rm -f Makefile
 distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
 
 dvi: dvi-recursive
@@ -537,6 +538,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
        -rm -rf $(top_srcdir)/autom4te.cache
+       -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive