diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8c23a63..83562eb0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/Makefile.am b/Makefile.am index 1b83a1e4..eb77e0d8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 \ diff --git a/data/satdata/Makefile.am b/data/satdata/Makefile.am index 24162a36..a697a79f 100644 --- a/data/satdata/Makefile.am +++ b/data/satdata/Makefile.am @@ -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 EXTRA_DIST = $(gpredict_sat_DATA) diff --git a/po/POTFILES.in b/po/POTFILES.in index 88ec1a2e..9a0e2ee7 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -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 src/gtk-single-sat.c src/gtk-sky-glance.c src/gui.c