Leonardo Di Venere / ctools

Commit 2aa3eefb6a5b8d6724fb37e52ba26f2d75130002

Authored by Jürgen Knödlseder
1 parent 8bc42582

Adapt code so that is passes make distcheck

Inline Side-by-side
Showing 4 changed files with 16 additions and 6 deletions
Makefile.am
  View file @2aa3eef
@@ -55,6 +55,10 @@ install-data-local: $(DOXYGEN_INSTALL_DATA_TARGETS) sphinx-install @@ -55,6 +55,10 @@ install-data-local: $(DOXYGEN_INSTALL_DATA_TARGETS) sphinx-install
55 55
56 uninstall-local: $(DOXYGEN_UNINSTALL_DATA_TARGETS) 56 uninstall-local: $(DOXYGEN_UNINSTALL_DATA_TARGETS)
57 57
  58 +# Files to be removed in build directory
  59 +clean-local:
  60 + rm -rf $(builddir)/.DS_Store
  61 +
58 # 62 #
59 # Additional rules 63 # Additional rules
60 # 64 #
cscripts/Makefile.am
  View file @2aa3eef
@@ -108,7 +108,11 @@ linkscripts = cscaldb \ @@ -108,7 +108,11 @@ linkscripts = cscaldb \
108 testscripts = $(srcdir)/tests/__init__.py \ 108 testscripts = $(srcdir)/tests/__init__.py \
109 $(top_srcdir)/test/testing.py \ 109 $(top_srcdir)/test/testing.py \
110 $(top_srcdir)/test/test_python_cscripts.py \ 110 $(top_srcdir)/test/test_python_cscripts.py \
  111 + $(top_srcdir)/test/test_cscript.py \
111 $(top_srcdir)/test/test_cscaldb.py \ 112 $(top_srcdir)/test/test_cscaldb.py \
  113 + $(top_srcdir)/test/test_csfindobs.py \
  114 + $(top_srcdir)/test/test_csinfo.py \
  115 + $(top_srcdir)/test/test_cslightcrv.py \
112 $(top_srcdir)/test/test_csmodelinfo.py \ 116 $(top_srcdir)/test/test_csmodelinfo.py \
113 $(top_srcdir)/test/test_csmodelmerge.py \ 117 $(top_srcdir)/test/test_csmodelmerge.py \
114 $(top_srcdir)/test/test_csmodelselect.py \ 118 $(top_srcdir)/test/test_csmodelselect.py \
@@ -116,7 +120,6 @@ testscripts = $(srcdir)/tests/__init__.py \ @@ -116,7 +120,6 @@ testscripts = $(srcdir)/tests/__init__.py \
116 $(top_srcdir)/test/test_csobsdef.py \ 120 $(top_srcdir)/test/test_csobsdef.py \
117 $(top_srcdir)/test/test_csobsinfo.py \ 121 $(top_srcdir)/test/test_csobsinfo.py \
118 $(top_srcdir)/test/test_csobsselect.py \ 122 $(top_srcdir)/test/test_csobsselect.py \
119 - $(top_srcdir)/test/test_cslightcrv.py \  
120 $(top_srcdir)/test/test_cspull.py \ 123 $(top_srcdir)/test/test_cspull.py \
121 $(top_srcdir)/test/test_csresmap.py \ 124 $(top_srcdir)/test/test_csresmap.py \
122 $(top_srcdir)/test/test_csroot2caldb.py \ 125 $(top_srcdir)/test/test_csroot2caldb.py \
@@ -214,7 +217,8 @@ testiactevents_DATA = $(testiactevents) @@ -214,7 +217,8 @@ testiactevents_DATA = $(testiactevents)
214 217
215 # Files to be distributed in the tar file 218 # Files to be distributed in the tar file
216 EXTRA_DIST = $(binscripts) $(pythonscripts) $(parfiles) \ 219 EXTRA_DIST = $(binscripts) $(pythonscripts) $(parfiles) \
217 - $(testscripts) $(testdata) $(testiactdata) 220 + $(testscripts) $(testdata) $(testiactdata) \
  221 + $(testiactevents)
218 222
219 # Add install hook rule to create symbolic links for cscripts 223 # Add install hook rule to create symbolic links for cscripts
220 install-data-hook: 224 install-data-hook:
pyext/Makefile.am
  View file @2aa3eef
1 ############################################################################# 1 #############################################################################
2 # Makefile for ctools Python extension module # 2 # Makefile for ctools Python extension module #
3 # ------------------------------------------------------------------------- # 3 # ------------------------------------------------------------------------- #
4 -# Copyright (C) 2011-2016 Juergen Knoedlseder # 4 +# Copyright (C) 2011-2017 Juergen Knoedlseder #
5 # ------------------------------------------------------------------------- # 5 # ------------------------------------------------------------------------- #
6 # # 6 # #
7 # This program is free software: you can redistribute it and/or modify # 7 # This program is free software: you can redistribute it and/or modify #
@@ -168,8 +168,9 @@ CLEANFILES = $(CLEAN_FILES) $(DEPFILES) @@ -168,8 +168,9 @@ CLEANFILES = $(CLEAN_FILES) $(DEPFILES)
168 # Files to be removed in build directory 168 # Files to be removed in build directory
169 clean-local: 169 clean-local:
170 rm -rf build 170 rm -rf build
  171 + rm -rf $(builddir)/ctools/tools.py
171 rm -rf $(builddir)/ctools/c*.py 172 rm -rf $(builddir)/ctools/c*.py
172 - rm -rf $(builddir)/ctools/c*.pyc 173 + rm -rf $(builddir)/ctools/*.pyc
173 rm -rf $(builddir)/ctools/*_wrap.cpp 174 rm -rf $(builddir)/ctools/*_wrap.cpp
174 rm -rf $(builddir)/ctools/_tools.so 175 rm -rf $(builddir)/ctools/_tools.so
175 rm -rf $(builddir)/ctools/__pycache__ 176 rm -rf $(builddir)/ctools/__pycache__
test/Makefile.am
  View file @2aa3eef
1 ############################################################################# 1 #############################################################################
2 # Makefile.am for ctools unit tests # 2 # Makefile.am for ctools unit tests #
3 # ------------------------------------------------------------------------- # 3 # ------------------------------------------------------------------------- #
4 -# Copyright (C) 2016 Juergen Knoedlseder # 4 +# Copyright (C) 2016-2017 Juergen Knoedlseder #
5 # ------------------------------------------------------------------------- # 5 # ------------------------------------------------------------------------- #
6 # # 6 # #
7 # This program is free software: you can redistribute it and/or modify # 7 # This program is free software: you can redistribute it and/or modify #
@@ -60,7 +60,8 @@ clean-local: @@ -60,7 +60,8 @@ clean-local:
60 rm -rf $(builddir)/pfiles 60 rm -rf $(builddir)/pfiles
61 rm -rf $(builddir)/prod3 61 rm -rf $(builddir)/prod3
62 rm -rf $(builddir)/csroot2caldb_* 62 rm -rf $(builddir)/csroot2caldb_*
63 - rm -rf $(builddir)/iactdata_* 63 + rm -rf $(builddir)/csiactcopy_*
  64 + rm -rf $(builddir)/.DS_Store
64 65
65 # Tests to be done on installed version 66 # Tests to be done on installed version
66 if WITH_PYTHON 67 if WITH_PYTHON