Skip to content

Commit 562ac8c

Browse files
committed
Use automake
Upgrade the build system to use automake instead of only autoconf. Amongst the enhancements this brings: - Build the correct bytecode and/or native code targets automatically. - Automake handles: make dist, make install As a side-effect of making this change, I got rid of the MANIFEST file (not neeed because automake does 'make dist' for us), and the ChangeLog (not needed because git). I also added 'make maintainer-check-extra-dist' which was useful for identifying all files missing from EXTRA_DIST. I removed the MinGW target. We don't use this and it didn't work. I also removed the ability to compile without ocamlfind, which didn't work and fixing it would have unnecessarily complicated things. ocamlfind is widely available. I also made minor adjustments to the README file. Signed-off-by: Richard W.M. Jones <[email protected]>
1 parent 492aab6 commit 562ac8c

File tree

15 files changed

+280
-1100
lines changed

15 files changed

+280
-1100
lines changed

.depend

Whitespace-only changes.

.gitignore

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,24 @@
1010
*.opt
1111
*.so
1212
*~
13-
Make.rules
13+
14+
Makefile.in
1415
Makefile
1516
core
1617
core.*
18+
.deps
19+
1720
/META
1821
/aclocal.m4
1922
/autom4te.cache
23+
/compile
2024
/config.cache
25+
/config.h
26+
/config.h.in
2127
/config.log
2228
/config.status
2329
/configure
30+
/depcomp
2431
/examples/domain_events
2532
/examples/get_all_domain_stats
2633
/examples/get_cpu_stats
@@ -31,6 +38,8 @@ core.*
3138
/libvirt/META.libvirt
3239
/libvirt/libvirt_generated.c
3340
/libvirt/libvirt_version.ml
41+
/missing
3442
/ocaml-libvirt-*.exe
3543
/ocaml-libvirt-*.tar.gz
3644
/run
45+
/stamp-h1

.gitlab-ci.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ stages:
2626
- autoreconf -i -f
2727
- ./configure
2828
- $MAKE
29-
- $MAKE check-manifest
29+
- $MAKE dist
30+
- $MAKE maintainer-check-extra-dist
3031

3132
.native_build_job:
3233
extends: .gitlab_native_build_job
@@ -36,6 +37,7 @@ stages:
3637
- autoreconf -i -f
3738
- ./configure
3839
- $MAKE
39-
- $MAKE check-manifest
40+
- $MAKE dist
41+
- $MAKE maintainer-check-extra-dist
4042

4143
include: '/ci/gitlab.yml'

0 commit comments

Comments
 (0)