Skip to content

Commit c4f1ec5

Browse files
author
Ian Dunn
committed
Fixed up build process and added more ignored files
* Makefile.am: Added doc as subdirectory * configure.ac: Added doc/Makefile as generated Makefile * doc/Makefile.am (html-local): New rule to rename aris.html/ to aris/ * doc/stamp-vti: Removed auto-generated file. * doc/version.texi: Removed auto-generated file.
1 parent 563a02f commit c4f1ec5

File tree

6 files changed

+9
-11
lines changed

6 files changed

+9
-11
lines changed

.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@ config.log
77
config.status
88
src/config.h
99
autom4te.cache
10+
build-aux
1011

1112
# Generated during build process
1213
*.o
1314
src/aris
1415
src/.deps
1516

1617
# Generated Documentation
17-
doc/*/aris/*.html
18+
doc/aris/*.html
1819
doc/aris.info
20+
doc/stamp-vti
21+
doc/version.texi

Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

1818
EXTRA_DIST = doc/aris.texi doc/aris.info doc/aris doc/proofs
19-
SUBDIRS = src
19+
SUBDIRS = src doc

configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,5 @@ if test "$WIN32" = "yes"; then
4747
AC_DEFINE([WIN32], [], ["Used when compiling for Windows"])
4848
fi
4949

50-
AC_CONFIG_FILES([Makefile src/Makefile])
50+
AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile])
5151
AC_OUTPUT

doc/Makefile.am

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
info_TEXINFOS = aris.texi
22

33
EXTRA_DIST = version.texi
4+
5+
html-local:
6+
-mv aris.html aris

doc/stamp-vti

-4
This file was deleted.

doc/version.texi

-4
This file was deleted.

0 commit comments

Comments
 (0)