Skip to content

Fix make distcheck #420

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.

Sign up for GitHub

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

Open
fillods wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix make distcheck #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
add156d
Fix make distcheck
fillods Sep 17, 2026
0fcaa9c
Remove dead wood
fillods Oct 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ jobs:
run: ./autogen.sh

- name: Build
run: make
run: make -j2

- name: Run tests
run: make check

- name: Check distribution
run: make -j2 distcheck
12 changes: 4 additions & 8 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src doc icons pixmaps data po

BUILT_SOURCES = $(top_srcdir)/.version
$(top_srcdir)/.version:
BUILT_SOURCES = $(top_builddir)/.version
MOSTLYCLEANFILES = $(top_builddir)/.version
$(top_builddir)/.version:
echo $(VERSION) > $@-t && mv $@-t $@
dist-hook:
echo $(VERSION) > $(distdir)/.tarball-version

install-data-local:
@$(NORMAL_INSTALL)
$(INSTALL_DATA) $(top_srcdir)/AUTHORS $(DESTDIR)$(pkgdatadir)
$(INSTALL_DATA) $(top_srcdir)/NEWS $(DESTDIR)$(pkgdatadir)
$(INSTALL_DATA) $(top_srcdir)/README $(DESTDIR)$(pkgdatadir)
$(INSTALL_DATA) $(top_srcdir)/COPYING $(DESTDIR)$(pkgdatadir)
pkgdata_DATA = AUTHORS NEWS README COPYING

EXTRA_DIST = \
autogen.sh \
Expand Down
2 changes: 1 addition & 1 deletion data/satdata/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
gpredict_satdir = $(pkgdatadir)/data/satdata

gpredict_sat_DATA = satellites.dat *.cat
gpredict_sat_DATA = satellites.dat $(top_srcdir)/data/satdata/*.cat

@csete csete Oct 7, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why this change is necessary?

@fillods fillods Oct 9, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without this change, make invoked with VPATH tries to find the *.cat files from the local build directory, where they are not. In VPATH build, the source dir and build dir are different.
If you don't like the form, here is another way to write it :

gpredict_sat_DATA = satellites.dat $(wildcard *.cat)

@csete csete Oct 10, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the info. It is fine with the long form.


EXTRA_DIST = $(gpredict_sat_DATA)
1 change: 0 additions & 1 deletion po/POTFILES.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ src/gtk-sat-module-popup.c
src/gtk-sat-module-tmg.c
src/gtk-sat-popup-common.c
src/gtk-sat-selector.c
src/gtk-sat-tree.c

@csete csete Oct 7, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change causes the build to fail.

@fillods fillods Oct 9, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually the files gtk-sat-tree.c and gtk-sat-tree.h are not compiled in according to src/Makefile.am.
The PR didn't go that far, but shouldn't they be removed from the repo altogether ?
That would solve the build error.
Let me know and I commit the removal.

@csete csete Oct 10, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, okay, got it.
Please do commit the removal, then I can merge it.

@fillods fillods Oct 12, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

src/gtk-single-sat.c
src/gtk-sky-glance.c
src/gui.c
Expand Down
Loading
Loading