Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Further build fixes #38

Merged
merged 8 commits into from
Nov 12, 2022
Merged

Further build fixes #38

merged 8 commits into from
Nov 12, 2022

Conversation

smcv
Copy link
Collaborator

@smcv smcv commented May 5, 2021

  • Revert addition of .gitignore

    I'd missed that this project is using git.mk, so .gitignore is meant
    to be a generated file here.

  • Update git.mk from its upstream

  • build: Add more files to be ignored by the generated .gitignore

  • build: Regenerate .gitignore when any Makefile changes

  • tests: Include test-basic.sh in dist tarballs with newer Automake

    The previous setup using $(addprefix) seems to be included in dist
    tarballs by the Automake used in Gitlab-CI, but not by the Automake
    in Debian unstable. Simplify the test setup so both work.

    This also results in the .test files being generated in tests/ rather
    than at top level, reducing clutter a bit.

  • tests: Add tests/git-evtag-compute-py to dist tarball unconditionally

    Adding this to EXTRA_DIST inside a conditional seems to work differently
    for different versions of Automake. Take it out of the conditional to
    make it more reliable.

  • build: Use subdir-objects Automake option to avoid some warnings

  • build: Remove GObject-Introspection machinery

    This silences some warnings about duplicated variables, and also removes
    some unnecessary code; there's no library here, so there's certainly
    nothing to introspect.

I'd missed that this project is using git.mk, so .gitignore is meant
to be a generated file here.

Signed-off-by: Simon McVittie <smcv@debian.org>
Signed-off-by: Simon McVittie <smcv@debian.org>
Signed-off-by: Simon McVittie <smcv@debian.org>
Signed-off-by: Simon McVittie <smcv@debian.org>
@smcv smcv changed the title Fix some build warnings Further build fixes Nov 12, 2022
The previous setup using $(addprefix) seems to be included in dist
tarballs by the Automake used in Gitlab-CI, but not by the Automake
in Debian unstable. Simplify the test setup so both work.

This also results in the .test files being generated in tests/ rather
than at top level, reducing clutter a bit.

Signed-off-by: Simon McVittie <smcv@debian.org>
Adding this to EXTRA_DIST inside a conditional seems to work differently
for different versions of Automake. Take it out of the conditional to
make it more reliable.

Signed-off-by: Simon McVittie <smcv@debian.org>
Signed-off-by: Simon McVittie <smcv@debian.org>
This silences some warnings about duplicated variables, and also removes
some unnecessary code; there's no library here, so there's certainly
nothing to introspect.

Signed-off-by: Simon McVittie <smcv@debian.org>
@cgwalters cgwalters merged commit 724d458 into cgwalters:main Nov 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants