Alexander Ziegler / gammalib

Commit e4f8f607da3ea8fcaed3467bec17e776b3231e22

Authored by Jürgen Knödlseder
1 parent e1e6f160

Replace $(builddir) by $(top_builddir) in Makefiles ($(builddir) does not exist … 

…on older systems, such as CentOS 5)
Inline Side-by-side
Showing 4 changed files with 40 additions and 40 deletions
Makefile.am
  View file @e4f8f60
... ... @@ -165,8 +165,8 @@ sphinx-install:
165 165  
166 166 # Add clean wrappers rule
167 167 clean-wrappers:
168   - rm -rf $(builddir)/pyext/gammalib/*.py
169   - rm -rf $(builddir)/pyext/gammalib/*_wrap.cpp
  168 + rm -rf $(top_builddir)/pyext/gammalib/*.py
  169 + rm -rf $(top_builddir)/pyext/gammalib/*_wrap.cpp
170 170  
171 171 # Add documentation rule:
172 172 doc: doxygen sphinx
... ...
pyext/Makefile.am
  View file @e4f8f60
... ... @@ -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
... ... @@ -175,32 +175,32 @@ swig: $(BUILT_SOURCES)
175 175  
176 176 # Rule for MWL module
177 177 if WITH_INST_MWL
178   -gammalib/mwl.py: gammalib/mwl_wrap.cpp
179   -gammalib/mwl_wrap.cpp: $(top_srcdir)/inst/mwl/pyext/mwl.i
  178 +$(top_builddir)/pyext/gammalib/mwl.py: $(top_builddir)/pyext/gammalib/mwl_wrap.cpp
  179 +$(top_builddir)/pyext/gammalib/mwl_wrap.cpp: $(top_srcdir)/inst/mwl/pyext/mwl.i
180 180 if $(SWIGCOMPILE) -MMD -MF "gammalib/mwl.Tpi" -I$(top_srcdir)/pyext -o gammalib/mwl_wrap.cpp -outdir gammalib $<; \
181 181 then mv -f "gammalib/mwl.Tpi" "gammalib/mwl.Pi"; else rm -f "gammalib/mwl.Tpi"; exit 1; fi
182 182 endif
183 183  
184 184 # Rule for CTA module
185 185 if WITH_INST_CTA
186   -gammalib/cta.py: gammalib/cta_wrap.cpp
187   -gammalib/cta_wrap.cpp: $(top_srcdir)/inst/cta/pyext/cta.i
  186 +$(top_builddir)/pyext/gammalib/cta.py: $(top_builddir)/pyext/gammalib/cta_wrap.cpp
  187 +$(top_builddir)/pyext/gammalib/cta_wrap.cpp: $(top_srcdir)/inst/cta/pyext/cta.i
188 188 if $(SWIGCOMPILE) -MMD -MF "gammalib/cta.Tpi" -I$(top_srcdir)/pyext -o gammalib/cta_wrap.cpp -outdir gammalib $<; \
189 189 then mv -f "gammalib/cta.Tpi" "gammalib/cta.Pi"; else rm -f "gammalib/cta.Tpi"; exit 1; fi
190 190 endif
191 191  
192 192 # Rule for LAT module
193 193 if WITH_INST_LAT
194   -gammalib/lat.py: gammalib/lat_wrap.cpp
195   -gammalib/lat_wrap.cpp: $(top_srcdir)/inst/lat/pyext/lat.i
  194 +$(top_builddir)/pyext/gammalib/lat.py: $(top_builddir)/pyext/gammalib/lat_wrap.cpp
  195 +$(top_builddir)/pyext/gammalib/lat_wrap.cpp: $(top_srcdir)/inst/lat/pyext/lat.i
196 196 if $(SWIGCOMPILE) -MMD -MF "gammalib/lat.Tpi" -I$(top_srcdir)/pyext -o gammalib/lat_wrap.cpp -outdir gammalib $<; \
197 197 then mv -f "gammalib/lat.Tpi" "gammalib/lat.Pi"; else rm -f "gammalib/lat.Tpi"; exit 1; fi
198 198 endif
199 199  
200 200 # Rule for COM module
201 201 if WITH_INST_COM
202   -gammalib/com.py: gammalib/com_wrap.cpp
203   -gammalib/com_wrap.cpp: $(top_srcdir)/inst/com/pyext/com.i
  202 +$(top_builddir)/pyext/gammalib/com.py: $(top_builddir)/pyext/gammalib/com_wrap.cpp
  203 +$(top_builddir)/pyext/gammalib/com_wrap.cpp: $(top_srcdir)/inst/com/pyext/com.i
204 204 if $(SWIGCOMPILE) -MMD -MF "gammalib/com.Tpi" -I$(top_srcdir)/pyext -o gammalib/com_wrap.cpp -outdir gammalib $<; \
205 205 then mv -f "gammalib/com.Tpi" "gammalib/com.Pi"; else rm -f "gammalib/com.Tpi"; exit 1; fi
206 206 endif
... ... @@ -270,16 +270,16 @@ CLEANFILES = $(CLEAN_FILES) $(DEPFILES)
270 270 clean-local:
271 271 rm -rf build
272 272 if BUILD_WRAPPERS
273   - rm -rf $(builddir)/gammalib/*.py
274   - rm -rf $(builddir)/gammalib/*_wrap.cpp
  273 + rm -rf $(top_builddir)/pyext/gammalib/*.py
  274 + rm -rf $(top_builddir)/pyext/gammalib/*_wrap.cpp
275 275 else
276   - if test "x$(builddir)" != "x$(srcdir)"; then \
277   - rm -rf $(builddir)/gammalib/*.py; \
278   - rm -rf $(builddir)/gammalib/*_wrap.cpp; \
  276 + if test "x$(top_builddir)" != "x$(top_srcdir)"; then \
  277 + rm -rf $(top_builddir)/pyext/gammalib/*.py; \
  278 + rm -rf $(top_builddir)/pyext/gammalib/*_wrap.cpp; \
279 279 fi
280 280 endif
281   - rm -rf $(builddir)/gammalib/*.pyc
282   - rm -rf $(builddir)/gammalib/_*.so
283   - rm -rf $(builddir)/gammalib/__pycache__
  281 + rm -rf $(top_builddir)/pyext/gammalib/*.pyc
  282 + rm -rf $(top_builddir)/pyext/gammalib/_*.so
  283 + rm -rf $(top_builddir)/pyext/gammalib/__pycache__
284 284  
285 285 endif # WITH_PYTHON
... ...
src/Makefile.am
  View file @e4f8f60
... ... @@ -68,20 +68,20 @@ scripts = gammalib-setup \
68 68 # Build libtool library
69 69 lib_LTLIBRARIES = libgamma.la
70 70 libgamma_la_SOURCES = $(sources)
71   -libgamma_la_LIBADD = $(builddir)/base/libbase.la \
72   - $(builddir)/support/libsupport.la \
73   - $(builddir)/linalg/liblinalg.la \
74   - $(builddir)/numerics/libnumerics.la \
75   - $(builddir)/fits/libfits.la \
76   - $(builddir)/xml/libxml.la \
77   - $(builddir)/vo/libvo.la \
78   - $(builddir)/xspec/libxspec.la \
79   - $(builddir)/sky/libsky.la \
80   - $(builddir)/opt/libopt.la \
81   - $(builddir)/obs/libobs.la \
82   - $(builddir)/model/libmodel.la \
83   - $(builddir)/app/libapp.la \
84   - $(builddir)/test/libtest.la \
  71 +libgamma_la_LIBADD = $(top_builddir)/src/base/libbase.la \
  72 + $(top_builddir)/src/support/libsupport.la \
  73 + $(top_builddir)/src/linalg/liblinalg.la \
  74 + $(top_builddir)/src/numerics/libnumerics.la \
  75 + $(top_builddir)/src/fits/libfits.la \
  76 + $(top_builddir)/src/xml/libxml.la \
  77 + $(top_builddir)/src/vo/libvo.la \
  78 + $(top_builddir)/src/xspec/libxspec.la \
  79 + $(top_builddir)/src/sky/libsky.la \
  80 + $(top_builddir)/src/opt/libopt.la \
  81 + $(top_builddir)/src/obs/libobs.la \
  82 + $(top_builddir)/src/model/libmodel.la \
  83 + $(top_builddir)/src/app/libapp.la \
  84 + $(top_builddir)/src/test/libtest.la \
85 85 $(INST_MWL) \
86 86 $(INST_CTA) \
87 87 $(INST_LAT) \
... ...
test/Makefile.am
  View file @e4f8f60
... ... @@ -204,13 +204,13 @@ all-local:
204 204  
205 205 # Files to be removed in build directory
206 206 clean-local:
207   - rm -rf $(builddir)/*.fits
208   - rm -rf $(builddir)/*.log
209   - rm -rf $(builddir)/*.html
210   - rm -rf $(builddir)/*.xml
211   - rm -rf $(builddir)/*.reg
212   - rm -rf $(builddir)/*.dat
213   - rm -rf $(builddir)/reports/*.xml
  207 + rm -rf $(top_builddir)/test/*.fits
  208 + rm -rf $(top_builddir)/test/*.log
  209 + rm -rf $(top_builddir)/test/*.html
  210 + rm -rf $(top_builddir)/test/*.xml
  211 + rm -rf $(top_builddir)/test/*.reg
  212 + rm -rf $(top_builddir)/test/*.dat
  213 + rm -rf $(top_builddir)/test/reports/*.xml
214 214  
215 215 # Tests to be done on installed version
216 216 if WITH_PYTHON
... ...