Dmitry Malyshev / ctools

Commit bebca54fb134898ef317a1ade6d4cc979a18ef43

Authored by Jürgen Knödlseder
1 parent 431bda7b

Replace $(builddir) by $(top_builddir)

Inline Side-by-side
Showing 4 changed files with 32 additions and 32 deletions
Makefile.am
  View file @bebca54
... ... @@ -57,7 +57,7 @@ uninstall-local: $(DOXYGEN_UNINSTALL_DATA_TARGETS)
57 57  
58 58 # Files to be removed in build directory
59 59 clean-local:
60   - rm -rf $(builddir)/.DS_Store
  60 + rm -rf $(top_builddir)/.DS_Store
61 61  
62 62 #
63 63 # Additional rules
... ...
cscripts/Makefile.am
  View file @bebca54
... ... @@ -20,7 +20,7 @@
20 20 #############################################################################
21 21  
22 22 # Scripts to be distributed in $(pyexecdir)/cscripts
23   -pythonscripts = $(builddir)/__init__.py \
  23 +pythonscripts = $(top_builddir)/cscripts/__init__.py \
24 24 $(srcdir)/cscaldb.py \
25 25 $(srcdir)/csinfo.py \
26 26 $(srcdir)/cslightcrv.py \
... ... @@ -242,15 +242,15 @@ uninstall-hook:
242 242 # Files to be removed in build directory
243 243 clean-local:
244 244 @if test '@srcdir@' != '@builddir@'; then \
245   - rm -rf $(builddir)/cs*.py; \
246   - rm -rf $(builddir)/obsutils.py; \
247   - rm -rf $(builddir)/modutils.py; \
248   - rm -rf $(builddir)/calutils.py; \
249   - rm -rf $(builddir)/ioutils.py; \
250   - rm -rf $(builddir)/*.par; \
  245 + rm -rf $(top_builddir)/cscripts/cs*.py; \
  246 + rm -rf $(top_builddir)/cscripts/obsutils.py; \
  247 + rm -rf $(top_builddir)/cscripts/modutils.py; \
  248 + rm -rf $(top_builddir)/cscripts/calutils.py; \
  249 + rm -rf $(top_builddir)/cscripts/ioutils.py; \
  250 + rm -rf $(top_builddir)/cscripts/*.par; \
251 251 fi
252   - rm -rf $(builddir)/*.pyc
253   - rm -rf $(builddir)/__pycache__
  252 + rm -rf $(top_builddir)/cscripts/*.pyc
  253 + rm -rf $(top_builddir)/cscripts/__pycache__
254 254  
255 255 # Uninstall the cscripts Python module
256 256 uninstall-local:
... ...
pyext/Makefile.am
  View file @bebca54
... ... @@ -33,7 +33,7 @@ if WITH_PYTHON
33 33 # shipped with the distribution of whether the wrappers have to be build
34 34 # using swig
35 35 if BUILD_WRAPPERS
36   - wrapperdir = $(builddir)
  36 + wrapperdir = $(top_builddir)/pyext
37 37 else
38 38 wrapperdir = $(srcdir)
39 39 endif
... ... @@ -99,8 +99,8 @@ CLEAN_FILES = $(BUILT_SOURCES)
99 99 swig: $(BUILT_SOURCES)
100 100  
101 101 # Rule for building Python wrappers using SWIG.
102   -ctools/tools.py: ctools/tools_wrap.cpp
103   -ctools/tools_wrap.cpp: ctools/tools.i
  102 +$(wrapperdir)/ctools/tools.py: $(wrapperdir)/ctools/tools_wrap.cpp
  103 +$(wrapperdir)/ctools/tools_wrap.cpp: ctools/tools.i
104 104 if $(SWIGCOMPILE) -MMD -MF "tools.Tpi" -o ctools/tools_wrap.cpp $<; \
105 105 then mv -f "tools.Tpi" "tools.Pi"; else rm -f "tools.Tpi"; exit 1; fi
106 106  
... ... @@ -168,11 +168,11 @@ CLEANFILES = $(CLEAN_FILES) $(DEPFILES)
168 168 # Files to be removed in build directory
169 169 clean-local:
170 170 rm -rf build
171   - rm -rf $(builddir)/ctools/tools.py
172   - rm -rf $(builddir)/ctools/c*.py
173   - rm -rf $(builddir)/ctools/*.pyc
174   - rm -rf $(builddir)/ctools/*_wrap.cpp
175   - rm -rf $(builddir)/ctools/_tools.so
176   - rm -rf $(builddir)/ctools/__pycache__
  171 + rm -rf $(top_builddir)/pyext/ctools/tools.py
  172 + rm -rf $(top_builddir)/pyext/ctools/c*.py
  173 + rm -rf $(top_builddir)/pyext/ctools/*.pyc
  174 + rm -rf $(top_builddir)/pyext/ctools/*_wrap.cpp
  175 + rm -rf $(top_builddir)/pyext/ctools/_tools.so
  176 + rm -rf $(top_builddir)/pyext/ctools/__pycache__
177 177  
178 178 endif # WITH_PYTHON
... ...
test/Makefile.am
  View file @bebca54
... ... @@ -49,19 +49,19 @@ all-local:
49 49  
50 50 # Files to be removed in build directory
51 51 clean-local:
52   - rm -rf $(builddir)/*.fits
53   - rm -rf $(builddir)/*.log
54   - rm -rf $(builddir)/*.xml
55   - rm -rf $(builddir)/*.eps
56   - rm -rf $(builddir)/*.dat
57   - rm -rf $(builddir)/*.reg
58   - rm -rf $(builddir)/reports/*.xml
59   - rm -rf $(builddir)/caldb
60   - rm -rf $(builddir)/pfiles
61   - rm -rf $(builddir)/prod3
62   - rm -rf $(builddir)/csroot2caldb_*
63   - rm -rf $(builddir)/csiactcopy_*
64   - rm -rf $(builddir)/.DS_Store
  52 + rm -rf $(top_builddir)/test/*.fits
  53 + rm -rf $(top_builddir)/test/*.log
  54 + rm -rf $(top_builddir)/test/*.xml
  55 + rm -rf $(top_builddir)/test/*.eps
  56 + rm -rf $(top_builddir)/test/*.dat
  57 + rm -rf $(top_builddir)/test/*.reg
  58 + rm -rf $(top_builddir)/test/reports/*.xml
  59 + rm -rf $(top_builddir)/test/caldb
  60 + rm -rf $(top_builddir)/test/pfiles
  61 + rm -rf $(top_builddir)/test/prod3
  62 + rm -rf $(top_builddir)/test/csroot2caldb_*
  63 + rm -rf $(top_builddir)/test/csiactcopy_*
  64 + rm -rf $(top_builddir)/test/.DS_Store
65 65  
66 66 # Tests to be done on installed version
67 67 if WITH_PYTHON
... ...