Fixed bug in Makefile.am.

[splint.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 5e2a43dc2fc6dc950d5ce5016ddc037d82d83fa5..1ec75b4e120cafec66d7a7e3bcabf9597ffc2421 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -80,6 +80,7 @@ MV = @MV@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RM = @RM@
+SED = @SED@
 VERSION = @VERSION@
 am__include = @am__include@
 am__quote = @am__quote@
@@ -88,14 +89,18 @@ install_sh = @install_sh@
 AUTOMAKE_OPTIONS = 1.5 foreign
 
 binaryfixscript = ./fixBinaryDist.sh
-SUBDIRS = lib imports test doc src
+SUBDIRS = src lib imports test doc
+
+binaryDir = bin
+binaryDirFiles = $(binaryDir)/Makefile.am $(binaryDir)/Makefile.in
 
 binaryBuiltFiles = Makefile.binary.am configure.binary.ac
+
 #include these in case we're trying to build on a systems
 #without the bleeding edge versions of automake and autoconf
 binaryDerivedFiles = Makefile.binary.in configure.binary
 
-EXTRA_DIST = $(binaryfixscript) $(binaryBuiltFiles) $(binaryDerivedFiles) preBuilt/Makefile.am preBuilt/Makefile.in
+EXTRA_DIST = $(binaryfixscript) $(binaryBuiltFiles) $(binaryDerivedFiles) $(binaryDirFiles) install.html
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -107,10 +112,10 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
        uninstall-info-recursive all-recursive install-data-recursive \
        install-exec-recursive installdirs-recursive install-recursive \
        uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = README ./stamp-h.in ChangeLog Makefile.am Makefile.in \
-       acinclude.m4 aclocal.m4 config.hin config/config.guess \
-       config/config.sub config/depcomp config/install-sh \
-       config/missing config/mkinstalldirs configure configure.ac
+DIST_COMMON = README ./stamp-h.in Makefile.am Makefile.in acinclude.m4 \
+       aclocal.m4 config.hin config/config.guess config/config.sub \
+       config/depcomp config/install-sh config/missing \
+       config/mkinstalldirs configure configure.ac
 DIST_SUBDIRS = $(SUBDIRS)
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -261,7 +266,7 @@ GZIP_ENV = --best
 distdir: $(DISTFILES)
        -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
        mkdir $(distdir)
-       $(mkinstalldirs) $(distdir)/config $(distdir)/preBuilt
+       $(mkinstalldirs) $(distdir)/$(binaryDir) $(distdir)/config
        @for file in $(DISTFILES); do \
          if test -f $$file; then d=.; else d=$(srcdir); fi; \
          dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -419,10 +424,29 @@ uninstall-info: uninstall-info-recursive
        uninstall-info-recursive uninstall-recursive
 
 
-bindist:
+.PHONY: test
+
+#try to remake these but don't stop if it fails.
+configure.binary:configure.binary.ac
+       -autoconf -oconfigure.binary configure.binary.ac
+
+Makefile.binary.in:Makefile.binary.am
+       -automake Makefile.binary
+
+$(binaryDir)/Makefile.in: $(binaryDir)/Makefile.am
+       -automake $(binaryDir)/Makefile
+
+preDist:  $(binaryDir)/Makefile.in  $(binaryDerivedFiles) 
+
+bindist: $(binaryDerivedFiles) 
        $(MAKE)
-       $(CP) src/splint preBuilt/splint
-       $(MAKE) -e dist dh_script=$(binaryfixscript) SUBDIRS="preBuilt lib imports  doc"
+       $(RM) -f $(binaryDir)/splint
+       $(CP) src/splint $(binaryDir)/splint
+       $(MV) install.html installSource.html
+       $(CP) doc/` uname | tr [A-Z] [a-z]`.html install.html
+       $(MAKE) -e dist dh_script=$(binaryfixscript) SUBDIRS="$(binaryDir) lib imports  doc"
+       $(MV) $(distdir).tar.gz $(distdir).`uname`.tgz
+       $(MV) installSource.html install.html
 
 dist-hook:
        cd $(distdir);  pwd; $(dh_script)