X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/363a5c931fa1dfe72d452f33b56b997bf24597fe..028230a4017e67c2de99d101f97b7c2e1f21e2a8:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9112557..c77eeda 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,22 +24,56 @@
 ## To report a bug: splint-bug@splint.org
 ## 
 
+.PHONY: test
+
 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
+#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
+	$(SED) -e s/Makefile\.binary/Makefile/ Makefile.binary.in > tMakefile.binary.in
+#	$(RM) Makefile.binary.in
+	$(CP) tMakefile.binary.in Makefile.binary.in
+#drl add this hack 3/1/2003
+#make the generated makefile depend on Makefile not Makefile.binary
+
+
 
-bindist:
+
+$(binaryDir)/Makefile.in: $(binaryDir)/Makefile.am
+	-automake $(binaryDir)/Makefile
+
+EXTRA_DIST = $(binaryfixscript) $(binaryBuiltFiles) $(binaryDerivedFiles) $(binaryDirFiles) install.html
+
+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)
+
+