Changeset 503 for ImageMagick/trunk

Timestamp:

10/27/09 19:21:20 (4 weeks ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk

Files:

• Makefile.in (modified) (14 diffs)
• filters/Makefile.am (modified) (3 diffs)
• filters/boost.c (added)

ImageMagick/trunk/Makefile.in

@@ -119 +119 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-#
-#  Copyright (C) 2003 - 2008 GraphicsMagick Group
 #
 #  Makefile for building ImageMagick filter modules.
@@ -1242 +1240 @@
         $(LDFLAGS) -o $@
 @WITH_MODULES_TRUE@am_filters_analyze_la_rpath = -rpath $(filtersdir)
+filters_boost_la_DEPENDENCIES = $(MAGICKCORE_LIBS) \
+        $(am__DEPENDENCIES_1)
+am_filters_boost_la_OBJECTS = filters/filters_boost_la-boost.lo
+filters_boost_la_OBJECTS = $(am_filters_boost_la_OBJECTS)
+filters_boost_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+        $(AM_CFLAGS) $(CFLAGS) $(filters_boost_la_LDFLAGS) $(LDFLAGS) \
+        -o $@
+@WITH_MODULES_TRUE@am_filters_boost_la_rpath = -rpath $(filtersdir)
 ltdl_dld_link_la_DEPENDENCIES =
 am_ltdl_dld_link_la_OBJECTS = ltdl/loaders/dld_link.lo
@@ -1400 +1407 @@
         coders/clipboard.c coders/emf.c coders/jbig.c coders/jpeg.c \
         coders/jp2.c coders/png.c coders/ept.c coders/tiff.c \
-        coders/wmf.c coders/x.c coders/xwd.c filters/analyze.c
+        coders/wmf.c coders/x.c coders/xwd.c filters/analyze.c \
+        filters/boost.c
 am__objects_2 = magick/magick_libMagickCore_la-animate.lo \
         magick/magick_libMagickCore_la-annotate.lo \
@@ -1613 +1621 @@
         $(am__objects_11) $(am__objects_12) $(am__objects_13) \
         $(am__objects_14) $(am__objects_15)
-am__objects_17 = filters/magick_libMagickCore_la-analyze.lo
+am__objects_17 = filters/magick_libMagickCore_la-analyze.lo \
+        filters/magick_libMagickCore_la-boost.lo
 @WITH_MODULES_FALSE@am_magick_libMagickCore_la_OBJECTS =  \
 @WITH_MODULES_FALSE@    $(am__objects_2) $(am__objects_3) \
@@ -1961 +1970 @@
         $(coders_xps_la_SOURCES) $(coders_xwd_la_SOURCES) \
         $(coders_ycbcr_la_SOURCES) $(coders_yuv_la_SOURCES) \
-        $(filters_analyze_la_SOURCES) $(ltdl_dld_link_la_SOURCES) \
-        $(ltdl_dlopen_la_SOURCES) $(ltdl_dyld_la_SOURCES) \
-        $(ltdl_libltdl_la_SOURCES) $(ltdl_libltdlc_la_SOURCES) \
-        $(ltdl_load_add_on_la_SOURCES) $(ltdl_loadlibrary_la_SOURCES) \
-        $(ltdl_shl_load_la_SOURCES) $(magick_libMagickCore_la_SOURCES) \
+        $(filters_analyze_la_SOURCES) $(filters_boost_la_SOURCES) \
+        $(ltdl_dld_link_la_SOURCES) $(ltdl_dlopen_la_SOURCES) \
+        $(ltdl_dyld_la_SOURCES) $(ltdl_libltdl_la_SOURCES) \
+        $(ltdl_libltdlc_la_SOURCES) $(ltdl_load_add_on_la_SOURCES) \
+        $(ltdl_loadlibrary_la_SOURCES) $(ltdl_shl_load_la_SOURCES) \
+        $(magick_libMagickCore_la_SOURCES) \
         $(wand_libMagickWand_la_SOURCES) \
         $(Magick___demo_analyze_SOURCES) \
@@ -2048 +2058 @@
         $(coders_xps_la_SOURCES) $(coders_xwd_la_SOURCES) \
         $(coders_ycbcr_la_SOURCES) $(coders_yuv_la_SOURCES) \
-        $(filters_analyze_la_SOURCES) $(ltdl_dld_link_la_SOURCES) \
-        $(ltdl_dlopen_la_SOURCES) $(ltdl_dyld_la_SOURCES) \
-        $(ltdl_libltdl_la_SOURCES) $(ltdl_libltdlc_la_SOURCES) \
-        $(ltdl_load_add_on_la_SOURCES) $(ltdl_loadlibrary_la_SOURCES) \
-        $(ltdl_shl_load_la_SOURCES) \
+        $(filters_analyze_la_SOURCES) $(filters_boost_la_SOURCES) \
+        $(ltdl_dld_link_la_SOURCES) $(ltdl_dlopen_la_SOURCES) \
+        $(ltdl_dyld_la_SOURCES) $(ltdl_libltdl_la_SOURCES) \
+        $(ltdl_libltdlc_la_SOURCES) $(ltdl_load_add_on_la_SOURCES) \
+        $(ltdl_loadlibrary_la_SOURCES) $(ltdl_shl_load_la_SOURCES) \
         $(am__magick_libMagickCore_la_SOURCES_DIST) \
         $(wand_libMagickWand_la_SOURCES) \
@@ -4035 +4045 @@
 filtersdir = $(FILTER_PATH)
 MAGICK_FILTER_SRCS = \
-        filters/analyze.c
+        filters/analyze.c \
+        filters/boost.c
 
 @WITH_MODULES_FALSE@filters_LTLIBRARIES = 
 @WITH_MODULES_TRUE@filters_LTLIBRARIES = \
-@WITH_MODULES_TRUE@     filters/analyze.la
+@WITH_MODULES_TRUE@     filters/analyze.la \
+@WITH_MODULES_TRUE@     filters/boost.la
 
 
@@ -4047 +4059 @@
 filters_analyze_la_LDFLAGS = $(MODULECOMMONFLAGS)
 filters_analyze_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS)
+
+# boost filter module
+filters_boost_la_SOURCES = filters/boost.c
+filters_boost_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
+filters_boost_la_LDFLAGS = $(MODULECOMMONFLAGS)
+filters_boost_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 wandincdir = $(topincludedir)/wand
 WAND_SOURCES = \
@@ -5307 +5325 @@
 filters/analyze.la: $(filters_analyze_la_OBJECTS) $(filters_analyze_la_DEPENDENCIES) filters/$(am__dirstamp)
         $(AM_V_CCLD)$(filters_analyze_la_LINK) $(am_filters_analyze_la_rpath) $(filters_analyze_la_OBJECTS) $(filters_analyze_la_LIBADD) $(LIBS)
+filters/filters_boost_la-boost.lo: filters/$(am__dirstamp) \
+        filters/$(DEPDIR)/$(am__dirstamp)
+filters/boost.la: $(filters_boost_la_OBJECTS) $(filters_boost_la_DEPENDENCIES) filters/$(am__dirstamp)
+        $(AM_V_CCLD)$(filters_boost_la_LINK) $(am_filters_boost_la_rpath) $(filters_boost_la_OBJECTS) $(filters_boost_la_LIBADD) $(LIBS)
 ltdl/loaders/$(am__dirstamp):
         @$(MKDIR_P) ltdl/loaders
@@ -5771 +5793 @@
         coders/$(DEPDIR)/$(am__dirstamp)
 filters/magick_libMagickCore_la-analyze.lo: filters/$(am__dirstamp) \
+        filters/$(DEPDIR)/$(am__dirstamp)
+filters/magick_libMagickCore_la-boost.lo: filters/$(am__dirstamp) \
         filters/$(DEPDIR)/$(am__dirstamp)
 magick/libMagickCore.la: $(magick_libMagickCore_la_OBJECTS) $(magick_libMagickCore_la_DEPENDENCIES) magick/$(am__dirstamp)
@@ -6611 +6635 @@
         -rm -f filters/filters_analyze_la-analyze.$(OBJEXT)
         -rm -f filters/filters_analyze_la-analyze.lo
+        -rm -f filters/filters_boost_la-boost.$(OBJEXT)
+        -rm -f filters/filters_boost_la-boost.lo
         -rm -f filters/magick_libMagickCore_la-analyze.$(OBJEXT)
         -rm -f filters/magick_libMagickCore_la-analyze.lo
+        -rm -f filters/magick_libMagickCore_la-boost.$(OBJEXT)
+        -rm -f filters/magick_libMagickCore_la-boost.lo
         -rm -f ltdl/loaders/dld_link.$(OBJEXT)
         -rm -f ltdl/loaders/dld_link.lo
@@ -7137 +7165 @@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-yuv.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@filters/$(DEPDIR)/filters_analyze_la-analyze.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@filters/$(DEPDIR)/filters_boost_la-boost.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@filters/$(DEPDIR)/magick_libMagickCore_la-analyze.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@filters/$(DEPDIR)/magick_libMagickCore_la-boost.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ltdl/$(DEPDIR)/ltdl_libltdl_la-lt__alloc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ltdl/$(DEPDIR)/ltdl_libltdl_la-lt_dlloader.Plo@am__quote@
@@ -8192 +8222 @@
 @am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filters_analyze_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o filters/filters_analyze_la-analyze.lo `test -f 'filters/analyze.c' || echo '$(srcdir)/'`filters/analyze.c
 
+filters/filters_boost_la-boost.lo: filters/boost.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filters_boost_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT filters/filters_boost_la-boost.lo -MD -MP -MF filters/$(DEPDIR)/filters_boost_la-boost.Tpo -c -o filters/filters_boost_la-boost.lo `test -f 'filters/boost.c' || echo '$(srcdir)/'`filters/boost.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) filters/$(DEPDIR)/filters_boost_la-boost.Tpo filters/$(DEPDIR)/filters_boost_la-boost.Plo
+@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='filters/boost.c' object='filters/filters_boost_la-boost.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filters_boost_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o filters/filters_boost_la-boost.lo `test -f 'filters/boost.c' || echo '$(srcdir)/'`filters/boost.c
+
 ltdl/loaders/ltdl_libltdl_la-preopen.lo: ltdl/loaders/preopen.c
 @am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ltdl/loaders/ltdl_libltdl_la-preopen.lo -MD -MP -MF ltdl/loaders/$(DEPDIR)/ltdl_libltdl_la-preopen.Tpo -c -o ltdl/loaders/ltdl_libltdl_la-preopen.lo `test -f 'ltdl/loaders/preopen.c' || echo '$(srcdir)/'`ltdl/loaders/preopen.c
@@ -9863 +9901 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o filters/magick_libMagickCore_la-analyze.lo `test -f 'filters/analyze.c' || echo '$(srcdir)/'`filters/analyze.c
+
+filters/magick_libMagickCore_la-boost.lo: filters/boost.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT filters/magick_libMagickCore_la-boost.lo -MD -MP -MF filters/$(DEPDIR)/magick_libMagickCore_la-boost.Tpo -c -o filters/magick_libMagickCore_la-boost.lo `test -f 'filters/boost.c' || echo '$(srcdir)/'`filters/boost.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) filters/$(DEPDIR)/magick_libMagickCore_la-boost.Tpo filters/$(DEPDIR)/magick_libMagickCore_la-boost.Plo
+@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='filters/boost.c' object='filters/magick_libMagickCore_la-boost.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o filters/magick_libMagickCore_la-boost.lo `test -f 'filters/boost.c' || echo '$(srcdir)/'`filters/boost.c
 
 wand/wand_libMagickWand_la-animate.lo: wand/animate.c

ImageMagick/trunk/filters/Makefile.am

@@ -13 +13 @@
 #  limitations under the License.
 #
-#  Copyright (C) 2003 - 2008 GraphicsMagick Group
-#
 #  Makefile for building ImageMagick filter modules.
 
@@ -21 +19 @@
 
 MAGICK_FILTER_SRCS = \
-        filters/analyze.c
+        filters/analyze.c \
+        filters/boost.c
 
 if WITH_MODULES
 filters_LTLIBRARIES = \
-        filters/analyze.la
+        filters/analyze.la \
+        filters/boost.la
 else
 filters_LTLIBRARIES =
@@ -36 +36 @@
 filters_analyze_la_LIBADD       = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 
+# boost filter module
+filters_boost_la_SOURCES      = filters/boost.c
+filters_boost_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
+filters_boost_la_LDFLAGS      = $(MODULECOMMONFLAGS)
+filters_boost_la_LIBADD       = $(MAGICKCORE_LIBS) $(MATH_LIBS)