2 Commits

Author	SHA1	Message	Date
espie	c6287b2b53	fix @conflict marker ... while there, put common things in Makefile.inc bump revs according to discrepancies in COMMENT and in @conflict	2012-06-25 15:45:14 +00:00
naddy	16568084ac	Import automake 1.8.5. ... Submitted by Jacob Meuser <jakemsr@jakemsr.com>. Automake is an experimental Makefile generator. It was inspired by the 4.4BSD make and include files, but aims to be portable and to conform to the GNU standards for Makefile variables and targets.	2005-04-17 20:37:31 +00:00