-# Copyright 1999-2010 ImageMagick Studio LLC, a non-profit organization
+# Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization
# dedicated to making software imaging solutions freely available.
#
# You may not use this file except in compliance with the License. You may
# Top-Level Makefile for building ImageMagick.
#
-AUTOMAKE_OPTIONS = 1.11 subdir-objects parallel-tests color-tests dist-zip dist-bzip2 dist-xz foreign
-
-topincludedir = @includedir@/ImageMagick
-
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
ACLOCAL_AMFLAGS = -I m4
MODULECOMMONFLAGS = -no-undefined -export-symbols-regex ".*" -shared -module -avoid-version
+SUBDIRS = .
+
# Options to pass when running configure in the distcheck target.
#
# We want to preserve user-provided option variables so the same
# compiler, headers, and libraries are used as for a normal build.
DISTCHECK_CONFIGURE_FLAGS=$(DISTCHECK_CONFIG_FLAGS)
+DISTCLEANFILES = _configs.sed MagickCore/magick-config.h
+
## Make sure these will be cleaned even when they're not built by default.
CLEANFILES = \
- $(LTDL_CLEANFILES) \
- $(WAND_CLEANFILES) \
+ $(MAGICKWAND_CLEANFILES) \
$(MAGICKPP_CLEANFILES) \
$(UTILITIES_CLEANFILES) \
$(TESTS_CLEANFILES)
# Binary scripts
bin_SCRIPTS = \
- $(MAGICK_BIN_SCRPTS) \
- $(WAND_BIN_SCRPTS) \
+ $(MAGICKCORE_BIN_SCRPTS) \
+ $(MAGICKWAND_BIN_SCRPTS) \
$(MAGICKPP_SCRPTS)
-include_HEADERS = \
- $(LTDL_INSTALLHEADERS)
+include_HEADERS =
# Headers which are not installed but which are distributed
noinst_HEADERS = \
- $(LIBLTDL_NOINST_HDRS) \
- $(MAGICK_NOINST_HDRS)
+ $(MAGICKCORE_NOINST_HDRS)
if WIN32_NATIVE_BUILD
SRCDIR='$(shell @WinPathScript@ $(srcdir)/)'
SRCDIR="$(srcdir)/"
endif
+# Tests with .tap extensions use the TAP protocol and TAP driver
+LOG_COMPILER = $(SHELL)
+
+SH_LOG_COMPILER = $(LOG_COMPILER)
+TAP_LOG_COMPILER = $(LOG_COMPILER)
+
+# Test extensions
+TEST_EXTENSIONS = .sh .tap
+
+TAP_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+ $(top_srcdir)/config/tap-driver.sh
+
# Environment parameters to be used during tests
TESTS_ENVIRONMENT = \
- COMPARE="$(MEMCHECK) @abs_top_builddir@/utilities/compare" \
- COMPOSITE="$(MEMCHECK) @abs_top_builddir@/utilities/composite" \
- CONJURE="$(MEMCHECK) @abs_top_builddir@/utilities/conjure" \
- CONVERT="$(MEMCHECK) @abs_top_builddir@/utilities/convert" \
- DISPLAY="$(MEMCHECK) @abs_top_builddir@/utilities/display" \
- MONTAGE="$(MEMCHECK) @abs_top_builddir@/utilities/montage" \
- VALIDATE="$(MEMCHECK) @abs_top_builddir@/tests/validate" \
- LD_LIBRARY_PATH="@abs_top_builddir@/magick/.libs:${LD_LIBRARY_PATH}" \
- MAGICK_CODER_MODULE_PATH='@MAGICK_CODER_MODULE_PATH@' \
- MAGICK_CONFIGURE_PATH='@MAGICK_CONFIGURE_BUILD_PATH@@DIRSEP@@MAGICK_CONFIGURE_SRC_PATH@' \
- MAGICK_FILTER_MODULE_PATH='@MAGICK_FILTER_MODULE_PATH@' \
MAKE="$(MAKE)" \
MAKEFLAGS="$(MAKEFLAGS)" \
- MEMCHECK="$(MEMCHECK)" \
- PATH="@abs_top_builddir@/utilities:${PATH}" \
- SRCDIR=$(SRCDIR)
-
-# Test extensions
-TEST_EXTENSIONS = .sh
+ MEMCHECK="$(MEMCHECK)"
# Tests to run
TESTS = \
$(TESTS_TESTS) \
$(MAGICKPP_TESTS) \
- $(WAND_TESTS) \
+ $(MAGICKWAND_TESTS) \
$(UTILITIES_TESTS)
# Tests which are expected to fail
Install-windows.txt \
magick.sh.in \
Magickshr.opt \
- Make.com \
NEWS.txt \
Platforms.txt \
README.txt \
EXTRA_DIST = \
$(TOP_EXTRA_DIST) \
$(CONFIG_EXTRA_DIST) \
- $(MAGICK_EXTRA_DIST) \
- $(WAND_EXTRA_DIST) \
+ $(MAGICKCORE_EXTRA_DIST) \
+ $(MAGICKWAND_EXTRA_DIST) \
$(MAGICKPP_EXTRA_DIST) \
$(UTILITIES_EXTRA_DIST) \
$(TESTS_EXTRA_DIST)
check_PROGRAMS = \
$(TESTS_CHECK_PGRMS) \
$(MAGICKPP_CHECK_PGRMS) \
- $(WAND_CHECK_PGRMS)
+ $(MAGICKWAND_CHECK_PGRMS)
include m4/Makefile.am
include config/Makefile.am
-include ltdl/Makefile.inc
include coders/Makefile.am
-include magick/Makefile.am
-include filters/Makefile.am
-include wand/Makefile.am
+include MagickCore/Makefile.am
+include MagickWand/Makefile.am
include Magick++/Makefile.am
+include filters/Makefile.am
include utilities/Makefile.am
include tests/Makefile.am
include PerlMagick/Makefile.am
# Files to install in Pkgconfig directory
pkgconfig_DATA = \
- $(MAGICK_PKGCONFIG) \
- $(WAND_PKGCONFIG) \
+ $(MAGICKCORE_PKGCONFIG) \
+ $(MAGICKWAND_PKGCONFIG) \
$(MAGICKPP_PKGCONFIG)
+# create a copy for pc file (ideally the non abi should be symlinked)
+%-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc: %.pc
+ cp -f $^ $@
+
# Manual pages to install
man_MANS = \
- $(MAGICK_MANS) \
- $(WAND_MANS) \
+ $(MAGICKCORE_MANS) \
+ $(MAGICKWAND_MANS) \
$(MAGICKPP_MANS) \
$(UTILITIES_MANS)
# Architecture independent data files installed in the package's data directory
-docdir = $(SHARE_PATH)
+docdir = $(DOCUMENTATION_PATH)
doc_DATA = \
LICENSE \
ChangeLog \
NEWS.txt
if MAINTAINER_MODE
-MAINTAINER_TARGETS = magick-version
+MAINTAINER_TARGETS = \
+ magick-version \
+ ImageMagick.spec \
+ $(PERLMAGICK_MAINTAINER_TARGETS)
endif
all-local: $(MAGICKPP_LOCAL_TARGETS) $(PERLMAGICK_ALL_LOCAL_TARGETS) $(MAINTAINER_TARGETS)
-install-exec-local: $(PERLMAGICK_INSTALL_EXEC_LOCAL_TARGETS)
+install-exec-local: $(PERLMAGICK_INSTALL_EXEC_LOCAL_TARGETS) \
+ $(UTILITIES_INSTALL_EXEC_LOCAL_TARGETS)
+
+install-data-local: $(MAGICK_INSTALL_DATA_LOCAL_TARGETS) \
+ $(PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS) \
+ $(HTML_INSTALL_DATA_TARGETS)
+
+uninstall-local: $(MAGICK_UNINSTALL_LOCAL_TARGETS) \
+ $(PERLMAGICK_UNINSTALL_LOCAL_TARGETS) \
+ $(HTML_UNINSTALL_DATA_TARGETS) \
+ $(UTILITIES_UNINSTALL_LOCAL_TARGETS)
-install-data-local: $(MAGICK_INSTALL_DATA_LOCAL_TARGETS) $(PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS) $(HTML_INSTALL_DATA_TARGETS)
+install-exec-hook:
+ $(install_sh) -d $(DESTDIR)/$(LIB_BIN_DIR_PATH)
+ cd $(DESTDIR)/$(bindir) && \
+ for CURR_PROG in `echo $(UTILITIES_PGMS) | sed 's/utilities\///g'`; do \
+ mv -f ./$$CURR_PROG$(EXEEXT) $(DESTDIR)/$(LIB_BIN_DIR_PATH)/$$CURR_PROG$(EXEEXT) && \
+ $(LN_S) $(LIB_BIN_DIR_PATH)/$$CURR_PROG$(EXEEXT) ./$$CURR_PROG$(EXEEXT); \
+ done;
-uninstall-local: $(MAGICK_UNINSTALL_LOCAL_TARGETS) $(PERLMAGICK_UNINSTALL_LOCAL_TARGETS) $(HTML_UNINSTALL_DATA_TARGETS)
+uninstall-hook:
+ for CURR_PROG in `echo $(UTILITIES_PGMS) | sed 's/utilities\///g'`; do \
+ rm -f $(DESTDIR)/$(LIB_DIR_PATH)/$$CURR_PROG$(EXEEXT); \
+ done;
+ rm -r -f $(LIB_BIN_DIR_PATH)
clean-local: $(PERLMAGICK_CLEAN_LOCAL_TARGETS)
check-local: $(PERLMAGICK_CHECK_LOCAL_TARGETS)
+# drd: valgrind's newer thread error detector
drd:
- $(MAKE) MEMCHECK='valgrind --tool=drd --check-stack-var=yes --var-info=yes --quiet $(VALGRIND_EXTRA_OPTS)' check
+ $(MAKE) MEMCHECK='valgrind --tool=drd --check-stack-var=yes --var-info=yes \
+ --quiet $(VALGRIND_EXTRA_OPTS)' check
+# helgrind: valgrind's older thread error detector
helgrind:
- $(MAKE) MEMCHECK='valgrind --tool=helgrind --quiet $(VALGRIND_EXTRA_OPTS)' check
+ $(MAKE) MEMCHECK='valgrind --tool=helgrind --error-exitcode=2 --quiet \
+ $(VALGRIND_EXTRA_OPTS)' check
+# memcheck: valgrind's memory access checker
memcheck:
- $(MAKE) MEMCHECK='valgrind --tool=memcheck --leak-check=full --num-callers=12 --quiet $(VALGRIND_EXTRA_OPTS)' check
+ $(MAKE) MEMCHECK='valgrind --tool=memcheck --leak-check=full --read-var-info=yes \
+ --error-exitcode=2 --track-origins=yes --num-callers=12 \
+ --quiet $(VALGRIND_EXTRA_OPTS)' check
+# ptrcheck: valgrind's experimental pointer checking tool.
ptrcheck:
$(MAKE) MEMCHECK='valgrind --tool=exp-ptrcheck --quiet $(VALGRIND_EXTRA_OPTS)' check
# Non-Automake subdirectories to distribute
-DISTDIRS = images scenes scripts www PerlMagick
+DISTDIRS = images scripts www PerlMagick
dist-hook:
( \
builddir=`pwd` ; \
cd $(srcdir) && \
( \
for dir in $(DISTDIRS) ; do \
- find $$dir -depth -print | egrep -v '(~$$)|(/CVS)|(/\.#)|(/\.deps)|(/\.svn)' \
+ find $$dir -depth -print | egrep -v '(~$$)|(/.svn)|(/\.#)|(/\.deps)|(/\.svn)' \
| cpio -pdum $$builddir/$(distdir) 2> /dev/null ; \
done \
) \
# Install HTML files
pkgdocdir = $(DOCUMENTATION_PATH)
-DOCDIRS = images www www/api www/api/MagickCore www/api/MagickWand www/Magick++
+DOCDIRS = images images/patterns www www/api www/source www/api/MagickCore www/api/MagickWand www/Magick++
HTML_INSTALL_DATA_TARGETS = install-data-html
install-data-html:
$(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
rm -f -r $(DESTDIR)$(pkgdocdir)/$$dir ; \
done
-# Ensure that version.h at $(srcdir)/magick/version.h is kept up to date.
-magick-version: magick/version.h
+# Ensure that version.h at $(srcdir)/MagickCore/version.h is kept up to date.
+magick-version: MagickCore/version.h
@if test -f "$(srcdir)/VisualMagick/installer/inc/version.isx.in" ; then \
./config.status --file="$(srcdir)/../VisualMagick/installer/inc/version.isx" 2> /dev/null ; \
fi
@if test -n "$(VPATH)" ; then \
- cmp magick/version.h $(srcdir)/magick/version.h > /dev/null ; \
+ cmp MagickCore/version.h $(srcdir)/MagickCore/version.h > /dev/null ; \
if test $$? -eq 1 ; then \
- echo "Updating $(srcdir)/magick/version.h ..."; \
- cp magick/version.h $(srcdir)/magick/version.h ; \
+ echo "Updating $(srcdir)/MagickCore/version.h ..."; \
+ cp MagickCore/version.h $(srcdir)/MagickCore/version.h ; \
fi ; \
fi ; \
touch magick-version
html:
doxygen config/MagickCore.dox
doxygen config/MagickWand.dox
+ doxygen config/Magick++.dox
#
# Build Windows source Zip and 7Zip balls
#
if ZIP_DELEGATE
-DIST_WINDOWS_SRC_ZIP=$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-windows.zip
+DIST_WINDOWS_SRC_ZIP=$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-windows.zip
else
DIST_WINDOWS_SRC_ZIP=
endif
if P7ZIP_DELEGATE
-DIST_WINDOWS_SRC_7ZIP=$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-windows.7z
+DIST_WINDOWS_SRC_7ZIP=$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-windows.7z
else
DIST_WINDOWS_SRC_7ZIP=
endif
$(DIST_WINDOWS_SRC_ZIP) $(DIST_WINDOWS_SRC_7ZIP) windows-dist:
- if test -d $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION) ; then \
- chmod -R u+w $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION) ; \
- rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION) ; \
+ if test -d $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM) ; then \
+ chmod -R u+w $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM) ; \
+ rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM) ; \
fi
+ svn export https://subversion.imagemagick.org/subversion/ImageMagick-Windows/trunk $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)
if ZIP_DELEGATE
rm -f $(DIST_WINDOWS_SRC_ZIP)
- $(ZIP) -r -9 -q $(DIST_WINDOWS_SRC_ZIP) $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)
+ $(ZIP) -r -9 -q $(DIST_WINDOWS_SRC_ZIP) $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)
endif # ZIP_DELEGATE
if P7ZIP_DELEGATE
rm -f $(DIST_WINDOWS_SRC_7ZIP)
- $(P7ZIP) a -t7z -mx=9 $(DIST_WINDOWS_SRC_7ZIP) $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)
+ $(P7ZIP) a -t7z -mx=9 $(DIST_WINDOWS_SRC_7ZIP) $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)
chmod 644 $(DIST_WINDOWS_SRC_7ZIP)
endif # P7ZIP_DELEGATE
- rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)
+ rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)
#
# RPM build support
#
if RPM_DELEGATE
-DIST_ARCHIVE_SRPM=$(distdir)-$(PACKAGE_RELEASE).src.rpm
+DIST_ARCHIVE_SRPM=$(distdir)-1.src.rpm
.PHONY: srpm
$(DIST_ARCHIVE_SRPM) srpm: dist-bzip2
rm -f $(DIST_ARCHIVE_SRPM)
@echo $(DIST_ARCHIVE_SRPM) is ready for distribution.
@echo ==============================================================
-RPMDIR=redhat
-RPMARCH=i386
+RPMDIR=rpmbuild
+RPMARCH=$(MAGICK_TARGET_CPU)
DIST_ARCHIVE_RPM= \
- $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
- $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
- $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-devel-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
- $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-devel-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
- $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-perl-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-$(PACKAGE_RELEASE).$(RPMARCH).rpm
+ $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
+ $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
+ $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-devel-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
+ $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-devel-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
+ $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-perl-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm
.PHONY: rpm
-rpm:
+rpm: dist
rm -rf $(RPMDIR)
- mkdir $(RPMDIR)
- mkdir $(RPMDIR)/BUILD
- mkdir $(RPMDIR)/RPMS
- $(MAKE) distcheck
+ $(MKDIR_P) $(RPMDIR)
+ $(MKDIR_P) $(RPMDIR)/BUILD
+ $(MKDIR_P) $(RPMDIR)/RPMS
$(RPM) --define="_sourcedir `pwd`" --define="_rpmdir `pwd`/$(RPMDIR)/RPMS" --define="_builddir `pwd`/$(RPMDIR)/BUILD" --nodeps -bb ImageMagick.spec
- rm -rf rpmbuild
@echo ==============================================================
@echo $(DIST_ARCHIVE_RPM) is ready for distribution.
@echo ==============================================================
$(MAKE) $(DIST_ARCHIVE_SRPM)
$(MAKE) $(DIST_WINDOWS_SRC_ZIP)
$(MAKE) $(DIST_WINDOWS_SRC_7ZIP)
- mv $(DIST_ARCHIVES) $(DIST_WINDOWS_SRC_ZIP) $(DIST_WINDOWS_SRC_7ZIP) $(DIST_ARCHIVE_SRPM) /var/ftp/pub/ImageMagick/beta/
+ mv $(DIST_ARCHIVES) $(DIST_WINDOWS_SRC_ZIP) $(DIST_WINDOWS_SRC_7ZIP) $(DIST_ARCHIVE_SRPM) /var/ftp/pub/ImageMagick/alpha/
projects / imagemagick / blobdiff