← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/imagemagick/oneiric-updates

« back to all changes in this revision

Viewing changes to Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-06-15 11:05:28 UTC
  • mfrom: (6.2.11 sid)
  • Revision ID: james.westby@ubuntu.com-20110615110528-08jgo07a4846xh8d
Tags: 8:6.6.0.4-3ubuntu1
https://launchpad.net/bugs/797595
* Resynchronise with Debian (LP: #797595).  Remaining changes:
  - Make ufraw-batch (universe) a suggestion instead of a recommendation.
  - Make debian/rules install target depend on check; they cannot reliably
    be run in parallel.
  - Don't set MAKEFLAGS in debian/rules; just pass it to the build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.am
68
68
 
69
69
# Environment parameters to be used during tests
70
70
TESTS_ENVIRONMENT = \
71
 
        COMPARE="$(MEMCHECK) @abs_top_builddir@/utilities/compare" \
72
 
        COMPOSITE="$(MEMCHECK) @abs_top_builddir@/utilities/composite" \
73
 
        CONJURE="$(MEMCHECK) @abs_top_builddir@/utilities/conjure" \
74
 
        CONVERT="$(MEMCHECK) @abs_top_builddir@/utilities/convert" \
75
 
        DISPLAY="$(MEMCHECK) @abs_top_builddir@/utilities/display" \
76
 
        IDENTIFY="$(MEMCHECK) @abs_top_builddir@/utilities/identify" \
77
 
        MONTAGE="$(MEMCHECK) @abs_top_builddir@/utilities/montage" \
78
 
        VALIDATE="$(MEMCHECK) @abs_top_builddir@/tests/validate" \
 
71
  COMPARE="$(MEMCHECK) @abs_top_builddir@/utilities/compare" \
 
72
  COMPOSITE="$(MEMCHECK) @abs_top_builddir@/utilities/composite" \
 
73
  CONJURE="$(MEMCHECK) @abs_top_builddir@/utilities/conjure" \
 
74
  CONVERT="$(MEMCHECK) @abs_top_builddir@/utilities/convert" \
 
75
  DISPLAY="$(MEMCHECK) @abs_top_builddir@/utilities/display" \
 
76
  IDENTIFY="$(MEMCHECK) @abs_top_builddir@/utilities/identify" \
 
77
  MONTAGE="$(MEMCHECK) @abs_top_builddir@/utilities/montage" \
 
78
  VALIDATE="$(MEMCHECK) @abs_top_builddir@/tests/validate" \
79
79
        LD_LIBRARY_PATH="@abs_top_builddir@/magick/.libs:${LD_LIBRARY_PATH}" \
80
80
        MAGICK_CODER_MODULE_PATH='@MAGICK_CODER_MODULE_PATH@' \
81
81
        MAGICK_CONFIGURE_PATH='@MAGICK_CONFIGURE_BUILD_PATH@@DIRSEP@@MAGICK_CONFIGURE_SRC_PATH@' \
180
180
 
181
181
if MAINTAINER_MODE
182
182
MAINTAINER_TARGETS = \
183
 
        magick-version \
184
 
  ImageMagick.spec \
185
 
  $(PERLMAGICK_MAINTAINER_TARGETS)
 
183
        magick-version
186
184
endif
187
185
 
188
186
all-local: $(MAGICKPP_LOCAL_TARGETS) $(PERLMAGICK_ALL_LOCAL_TARGETS) $(MAINTAINER_TARGETS)
201
199
 
202
200
check-local: $(PERLMAGICK_CHECK_LOCAL_TARGETS)
203
201
 
204
 
# drd: valgrind's newer thread error detector
205
 
drd:
206
 
  $(MAKE) MEMCHECK='valgrind --tool=drd --check-stack-var=yes --var-info=yes \
207
 
    --quiet $(VALGRIND_EXTRA_OPTS)' check
208
 
 
209
 
# drd: valgrind's newer thread error detector
210
 
drd:
211
 
        $(MAKE) MEMCHECK='valgrind --tool=drd --check-stack-var=yes --var-info=yes \
212
 
          --quiet $(VALGRIND_EXTRA_OPTS)' check
213
 
 
214
 
# helgrind: valgrind's older thread error detector
 
202
drd:
 
203
        $(MAKE) MEMCHECK='valgrind --tool=drd --check-stack-var=yes --var-info=yes --quiet $(VALGRIND_EXTRA_OPTS)' check
 
204
 
215
205
helgrind:
216
 
        $(MAKE) MEMCHECK='valgrind --tool=helgrind --error-exitcode=2 --quiet \
217
 
        $(VALGRIND_EXTRA_OPTS)' check
 
206
        $(MAKE) MEMCHECK='valgrind --tool=helgrind --quiet $(VALGRIND_EXTRA_OPTS)' check
218
207
 
219
 
# memcheck: valgrind's memory access checker
220
208
memcheck:
221
 
        $(MAKE) MEMCHECK='valgrind --tool=memcheck --leak-check=full --read-var-info=yes \
222
 
        --error-exitcode=2 --track-origins=yes --num-callers=12 \
223
 
        --quiet $(VALGRIND_EXTRA_OPTS)' check
 
209
        $(MAKE) MEMCHECK='valgrind --tool=memcheck --leak-check=full --num-callers=12 --quiet $(VALGRIND_EXTRA_OPTS)' check
224
210
 
225
 
# ptrcheck: valgrind's experimental pointer checking tool.
226
211
ptrcheck:
227
212
        $(MAKE) MEMCHECK='valgrind --tool=exp-ptrcheck --quiet $(VALGRIND_EXTRA_OPTS)' check
228
213
 
328
313
#
329
314
if RPM_DELEGATE
330
315
 
331
 
DIST_ARCHIVE_SRPM=$(distdir)-1.src.rpm
 
316
DIST_ARCHIVE_SRPM=$(distdir).src.rpm
332
317
.PHONY: srpm
333
 
$(DIST_ARCHIVE_SRPM) srpm: dist
 
318
$(DIST_ARCHIVE_SRPM) srpm: dist-bzip2
334
319
        rm -f $(DIST_ARCHIVE_SRPM)
335
320
        $(RPM) --define="_sourcedir `pwd`" --define="_srcrpmdir `pwd`" --nodeps --bs ImageMagick.spec
336
321
        @echo ==============================================================
337
322
        @echo $(DIST_ARCHIVE_SRPM) is ready for distribution.
338
323
        @echo ==============================================================
339
324
 
340
 
RPMDIR=rpmbuild
341
 
RPMARCH=$(MAGICK_TARGET_CPU)
 
325
RPMDIR=redhat
 
326
RPMARCH=i386
342
327
 
343
328
DIST_ARCHIVE_RPM= \
344
329
        $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
348
333
        $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-perl-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm
349
334
 
350
335
.PHONY: rpm
351
 
rpm:    dist
 
336
rpm:
352
337
        rm -rf $(RPMDIR)
353
 
        $(MKDIR_P) $(RPMDIR)
354
 
        $(MKDIR_P) $(RPMDIR)/BUILD
355
 
        $(MKDIR_P) $(RPMDIR)/RPMS
 
338
        mkdir $(RPMDIR)
 
339
        mkdir $(RPMDIR)/BUILD
 
340
        mkdir $(RPMDIR)/RPMS
 
341
        $(MAKE) distcheck
356
342
        $(RPM) --define="_sourcedir `pwd`" --define="_rpmdir `pwd`/$(RPMDIR)/RPMS" --define="_builddir `pwd`/$(RPMDIR)/BUILD" --nodeps -bb ImageMagick.spec
 
343
        rm -rf rpmbuild
357
344
        @echo ==============================================================
358
345
        @echo $(DIST_ARCHIVE_RPM) is ready for distribution.
359
346
        @echo ==============================================================