From 2aa3eefb6a5b8d6724fb37e52ba26f2d75130002 Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Thu, 23 Feb 2017 15:42:30 +0100 Subject: [PATCH] Adapt code so that is passes make distcheck --- Makefile.am | 4 ++++ cscripts/Makefile.am | 8 ++++++-- pyext/Makefile.am | 5 +++-- test/Makefile.am | 5 +++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6662a6a..28a9089 100644 --- a/Makefile.am +++ b/Makefile.am @@ -55,6 +55,10 @@ install-data-local: $(DOXYGEN_INSTALL_DATA_TARGETS) sphinx-install uninstall-local: $(DOXYGEN_UNINSTALL_DATA_TARGETS) +# Files to be removed in build directory +clean-local: + rm -rf $(builddir)/.DS_Store + # # Additional rules # diff --git a/cscripts/Makefile.am b/cscripts/Makefile.am index 401a77f..f5a324e 100644 --- a/cscripts/Makefile.am +++ b/cscripts/Makefile.am @@ -108,7 +108,11 @@ linkscripts = cscaldb \ testscripts = $(srcdir)/tests/__init__.py \ $(top_srcdir)/test/testing.py \ $(top_srcdir)/test/test_python_cscripts.py \ + $(top_srcdir)/test/test_cscript.py \ $(top_srcdir)/test/test_cscaldb.py \ + $(top_srcdir)/test/test_csfindobs.py \ + $(top_srcdir)/test/test_csinfo.py \ + $(top_srcdir)/test/test_cslightcrv.py \ $(top_srcdir)/test/test_csmodelinfo.py \ $(top_srcdir)/test/test_csmodelmerge.py \ $(top_srcdir)/test/test_csmodelselect.py \ @@ -116,7 +120,6 @@ testscripts = $(srcdir)/tests/__init__.py \ $(top_srcdir)/test/test_csobsdef.py \ $(top_srcdir)/test/test_csobsinfo.py \ $(top_srcdir)/test/test_csobsselect.py \ - $(top_srcdir)/test/test_cslightcrv.py \ $(top_srcdir)/test/test_cspull.py \ $(top_srcdir)/test/test_csresmap.py \ $(top_srcdir)/test/test_csroot2caldb.py \ @@ -214,7 +217,8 @@ testiactevents_DATA = $(testiactevents) # Files to be distributed in the tar file EXTRA_DIST = $(binscripts) $(pythonscripts) $(parfiles) \ - $(testscripts) $(testdata) $(testiactdata) + $(testscripts) $(testdata) $(testiactdata) \ + $(testiactevents) # Add install hook rule to create symbolic links for cscripts install-data-hook: diff --git a/pyext/Makefile.am b/pyext/Makefile.am index 69dd74f..2e627d7 100755 --- a/pyext/Makefile.am +++ b/pyext/Makefile.am @@ -1,7 +1,7 @@ ############################################################################# # Makefile for ctools Python extension module # # ------------------------------------------------------------------------- # -# Copyright (C) 2011-2016 Juergen Knoedlseder # +# Copyright (C) 2011-2017 Juergen Knoedlseder # # ------------------------------------------------------------------------- # # # # This program is free software: you can redistribute it and/or modify # @@ -168,8 +168,9 @@ CLEANFILES = $(CLEAN_FILES) $(DEPFILES) # Files to be removed in build directory clean-local: rm -rf build + rm -rf $(builddir)/ctools/tools.py rm -rf $(builddir)/ctools/c*.py - rm -rf $(builddir)/ctools/c*.pyc + rm -rf $(builddir)/ctools/*.pyc rm -rf $(builddir)/ctools/*_wrap.cpp rm -rf $(builddir)/ctools/_tools.so rm -rf $(builddir)/ctools/__pycache__ diff --git a/test/Makefile.am b/test/Makefile.am index 067a2f1..40838be 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,7 +1,7 @@ ############################################################################# # Makefile.am for ctools unit tests # # ------------------------------------------------------------------------- # -# Copyright (C) 2016 Juergen Knoedlseder # +# Copyright (C) 2016-2017 Juergen Knoedlseder # # ------------------------------------------------------------------------- # # # # This program is free software: you can redistribute it and/or modify # @@ -60,7 +60,8 @@ clean-local: rm -rf $(builddir)/pfiles rm -rf $(builddir)/prod3 rm -rf $(builddir)/csroot2caldb_* - rm -rf $(builddir)/iactdata_* + rm -rf $(builddir)/csiactcopy_* + rm -rf $(builddir)/.DS_Store # Tests to be done on installed version if WITH_PYTHON -- libgit2 0.21.4