(no commit message)

diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am
index b51f7863e22d89e0e7ba60acb7b1ecc486899d7a..611da98c1196835668bf41a80a65685e4a055e79 100644 (file)
--- a/MagickCore/Makefile.am
+++ b/MagickCore/Makefile.am
@@ -270,15 +270,15 @@ MAGICKCORE_BASE_SRCS = \
 
 if WIN32_NATIVE_BUILD
 MAGICKCORE_PLATFORM_SRCS = \
-  magick/nt-base.c \
-  magick/nt-base.h \
-  magick/nt-feature.c \
-  magick/nt-feature.h
+  MagickCore/nt-base.c \
+  MagickCore/nt-base.h \
+  MagickCore/nt-feature.c \
+  MagickCore/nt-feature.h
 else
 if CYGWIN_BUILD
 MAGICKCORE_PLATFORM_SRCS = \
-  magick/nt-feature.c \
-  magick/nt-feature.h
+  MagickCore/nt-feature.c \
+  MagickCore/nt-feature.h
 else
 MAGICKCORE_PLATFORM_SRCS =
 endif # if CYGWIN_BUILD

diff --git a/Makefile.in b/Makefile.in
index 462deb3ccf44dd35f2a90e629298fb769c1a382e..9401d40091c13e098fd6402ccb34b01dd3f7ef21 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -475,37 +475,37 @@ am__MagickCore_libMagickCore_la_SOURCES_DIST =  \
        MagickCore/widget.h MagickCore/widget-private.h \
        MagickCore/xml-tree.c MagickCore/xml-tree.h \
        MagickCore/xml-tree-private.h MagickCore/xwindow.c \
-       MagickCore/xwindow.h magick/nt-feature.c magick/nt-feature.h \
-       magick/nt-base.c magick/nt-base.h coders/aai.c coders/art.c \
-       coders/avs.c coders/bgr.c coders/bmp.c coders/braille.c \
-       coders/cals.c coders/caption.c coders/cin.c coders/cip.c \
-       coders/clip.c coders/cmyk.c coders/cut.c coders/dcm.c \
-       coders/dds.c coders/debug.c coders/dib.c coders/dng.c \
-       coders/dot.c coders/dpx.c coders/fax.c coders/fits.c \
-       coders/gif.c coders/gradient.c coders/gray.c coders/hald.c \
-       coders/hdr.c coders/histogram.c coders/hrz.c coders/html.c \
-       coders/icon.c coders/info.c coders/inline.c coders/ipl.c \
-       coders/label.c coders/mac.c coders/magick.c coders/map.c \
-       coders/mat.c coders/matte.c coders/meta.c coders/miff.c \
-       coders/mono.c coders/mpc.c coders/mpeg.c coders/mpr.c \
-       coders/msl.c coders/mtv.c coders/mvg.c coders/null.c \
-       coders/otb.c coders/palm.c coders/pattern.c coders/pcd.c \
-       coders/pcl.c coders/pcx.c coders/pdb.c coders/pdf.c \
-       coders/pes.c coders/pict.c coders/pix.c coders/plasma.c \
-       coders/pnm.c coders/preview.c coders/ps.c coders/ps2.c \
-       coders/ps3.c coders/psd.c coders/pwp.c coders/raw.c \
-       coders/rgb.c coders/rla.c coders/rle.c coders/scr.c \
-       coders/sct.c coders/sfw.c coders/sgi.c coders/stegano.c \
-       coders/sun.c coders/svg.c coders/tga.c coders/thumbnail.c \
-       coders/tile.c coders/tim.c coders/ttf.c coders/txt.c \
-       coders/uil.c coders/url.c coders/uyvy.c coders/vicar.c \
-       coders/vid.c coders/viff.c coders/wbmp.c coders/wpg.c \
-       coders/xbm.c coders/xc.c coders/xcf.c coders/xpm.c \
-       coders/xps.c coders/ycbcr.c coders/yuv.c coders/dps.c \
-       coders/djvu.c coders/exr.c coders/fpx.c 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/webp.c \
-       coders/wmf.c coders/x.c coders/xwd.c filters/analyze.c
+       MagickCore/xwindow.h MagickCore/nt-feature.c \
+       MagickCore/nt-base.c coders/aai.c coders/art.c coders/avs.c \
+       coders/bgr.c coders/bmp.c coders/braille.c coders/cals.c \
+       coders/caption.c coders/cin.c coders/cip.c coders/clip.c \
+       coders/cmyk.c coders/cut.c coders/dcm.c coders/dds.c \
+       coders/debug.c coders/dib.c coders/dng.c coders/dot.c \
+       coders/dpx.c coders/fax.c coders/fits.c coders/gif.c \
+       coders/gradient.c coders/gray.c coders/hald.c coders/hdr.c \
+       coders/histogram.c coders/hrz.c coders/html.c coders/icon.c \
+       coders/info.c coders/inline.c coders/ipl.c coders/label.c \
+       coders/mac.c coders/magick.c coders/map.c coders/mat.c \
+       coders/matte.c coders/meta.c coders/miff.c coders/mono.c \
+       coders/mpc.c coders/mpeg.c coders/mpr.c coders/msl.c \
+       coders/mtv.c coders/mvg.c coders/null.c coders/otb.c \
+       coders/palm.c coders/pattern.c coders/pcd.c coders/pcl.c \
+       coders/pcx.c coders/pdb.c coders/pdf.c coders/pes.c \
+       coders/pict.c coders/pix.c coders/plasma.c coders/pnm.c \
+       coders/preview.c coders/ps.c coders/ps2.c coders/ps3.c \
+       coders/psd.c coders/pwp.c coders/raw.c coders/rgb.c \
+       coders/rla.c coders/rle.c coders/scr.c coders/sct.c \
+       coders/sfw.c coders/sgi.c coders/stegano.c coders/sun.c \
+       coders/svg.c coders/tga.c coders/thumbnail.c coders/tile.c \
+       coders/tim.c coders/ttf.c coders/txt.c coders/uil.c \
+       coders/url.c coders/uyvy.c coders/vicar.c coders/vid.c \
+       coders/viff.c coders/wbmp.c coders/wpg.c coders/xbm.c \
+       coders/xc.c coders/xcf.c coders/xpm.c coders/xps.c \
+       coders/ycbcr.c coders/yuv.c coders/dps.c coders/djvu.c \
+       coders/exr.c coders/fpx.c 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/webp.c coders/wmf.c \
+       coders/x.c coders/xwd.c filters/analyze.c
 am__objects_1 = MagickCore/MagickCore_libMagickCore_la-accelerate.lo \
        MagickCore/MagickCore_libMagickCore_la-animate.lo \
        MagickCore/MagickCore_libMagickCore_la-annotate.lo \
@@ -594,9 +594,9 @@ am__objects_1 = MagickCore/MagickCore_libMagickCore_la-accelerate.lo \
        MagickCore/MagickCore_libMagickCore_la-widget.lo \
        MagickCore/MagickCore_libMagickCore_la-xml-tree.lo \
        MagickCore/MagickCore_libMagickCore_la-xwindow.lo
-@CYGWIN_BUILD_TRUE@@WIN32_NATIVE_BUILD_FALSE@am__objects_2 = magick/MagickCore_libMagickCore_la-nt-feature.lo
-@WIN32_NATIVE_BUILD_TRUE@am__objects_2 = magick/MagickCore_libMagickCore_la-nt-base.lo \
-@WIN32_NATIVE_BUILD_TRUE@      magick/MagickCore_libMagickCore_la-nt-feature.lo
+@CYGWIN_BUILD_TRUE@@WIN32_NATIVE_BUILD_FALSE@am__objects_2 = MagickCore/MagickCore_libMagickCore_la-nt-feature.lo
+@WIN32_NATIVE_BUILD_TRUE@am__objects_2 = MagickCore/MagickCore_libMagickCore_la-nt-base.lo \
+@WIN32_NATIVE_BUILD_TRUE@      MagickCore/MagickCore_libMagickCore_la-nt-feature.lo
 @DPS_DELEGATE_TRUE@am__objects_3 =  \
 @DPS_DELEGATE_TRUE@    coders/MagickCore_libMagickCore_la-dps.lo
 @DJVU_DELEGATE_TRUE@am__objects_4 = coders/MagickCore_libMagickCore_la-djvu.lo
@@ -4152,14 +4152,14 @@ MAGICKCORE_BASE_SRCS = \
 
 @CYGWIN_BUILD_FALSE@@WIN32_NATIVE_BUILD_FALSE@MAGICKCORE_PLATFORM_SRCS = 
 @CYGWIN_BUILD_TRUE@@WIN32_NATIVE_BUILD_FALSE@MAGICKCORE_PLATFORM_SRCS = \
-@CYGWIN_BUILD_TRUE@@WIN32_NATIVE_BUILD_FALSE@  magick/nt-feature.c \
-@CYGWIN_BUILD_TRUE@@WIN32_NATIVE_BUILD_FALSE@  magick/nt-feature.h
+@CYGWIN_BUILD_TRUE@@WIN32_NATIVE_BUILD_FALSE@  MagickCore/nt-feature.c \
+@CYGWIN_BUILD_TRUE@@WIN32_NATIVE_BUILD_FALSE@  MagickCore/nt-feature.h
 
 @WIN32_NATIVE_BUILD_TRUE@MAGICKCORE_PLATFORM_SRCS = \
-@WIN32_NATIVE_BUILD_TRUE@  magick/nt-base.c \
-@WIN32_NATIVE_BUILD_TRUE@  magick/nt-base.h \
-@WIN32_NATIVE_BUILD_TRUE@  magick/nt-feature.c \
-@WIN32_NATIVE_BUILD_TRUE@  magick/nt-feature.h
+@WIN32_NATIVE_BUILD_TRUE@  MagickCore/nt-base.c \
+@WIN32_NATIVE_BUILD_TRUE@  MagickCore/nt-base.h \
+@WIN32_NATIVE_BUILD_TRUE@  MagickCore/nt-feature.c \
+@WIN32_NATIVE_BUILD_TRUE@  MagickCore/nt-feature.h
 
 MAGICKCORE_INCLUDE_HDRS = \
        MagickCore/MagickCore.h \
@@ -5433,16 +5433,12 @@ MagickCore/MagickCore_libMagickCore_la-xml-tree.lo:  \
 MagickCore/MagickCore_libMagickCore_la-xwindow.lo:  \
        MagickCore/$(am__dirstamp) \
        MagickCore/$(DEPDIR)/$(am__dirstamp)
-magick/$(am__dirstamp):
-       @$(MKDIR_P) magick
-       @: > magick/$(am__dirstamp)
-magick/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) magick/$(DEPDIR)
-       @: > magick/$(DEPDIR)/$(am__dirstamp)
-magick/MagickCore_libMagickCore_la-nt-feature.lo:  \
-       magick/$(am__dirstamp) magick/$(DEPDIR)/$(am__dirstamp)
-magick/MagickCore_libMagickCore_la-nt-base.lo: magick/$(am__dirstamp) \
-       magick/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-nt-feature.lo:  \
+       MagickCore/$(am__dirstamp) \
+       MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-nt-base.lo:  \
+       MagickCore/$(am__dirstamp) \
+       MagickCore/$(DEPDIR)/$(am__dirstamp)
 coders/$(am__dirstamp):
        @$(MKDIR_P) coders
        @: > coders/$(am__dirstamp)
@@ -6758,6 +6754,10 @@ mostlyclean-compile:
        -rm -f MagickCore/MagickCore_libMagickCore_la-montage.lo
        -rm -f MagickCore/MagickCore_libMagickCore_la-morphology.$(OBJEXT)
        -rm -f MagickCore/MagickCore_libMagickCore_la-morphology.lo
+       -rm -f MagickCore/MagickCore_libMagickCore_la-nt-base.$(OBJEXT)
+       -rm -f MagickCore/MagickCore_libMagickCore_la-nt-base.lo
+       -rm -f MagickCore/MagickCore_libMagickCore_la-nt-feature.$(OBJEXT)
+       -rm -f MagickCore/MagickCore_libMagickCore_la-nt-feature.lo
        -rm -f MagickCore/MagickCore_libMagickCore_la-option.$(OBJEXT)
        -rm -f MagickCore/MagickCore_libMagickCore_la-option.lo
        -rm -f MagickCore/MagickCore_libMagickCore_la-paint.$(OBJEXT)
@@ -7384,10 +7384,6 @@ mostlyclean-compile:
        -rm -f ltdl/ltdl_libltdlc_la-ltdl.lo
        -rm -f ltdl/ltdl_libltdlc_la-slist.$(OBJEXT)
        -rm -f ltdl/ltdl_libltdlc_la-slist.lo
-       -rm -f magick/MagickCore_libMagickCore_la-nt-base.$(OBJEXT)
-       -rm -f magick/MagickCore_libMagickCore_la-nt-base.lo
-       -rm -f magick/MagickCore_libMagickCore_la-nt-feature.$(OBJEXT)
-       -rm -f magick/MagickCore_libMagickCore_la-nt-feature.lo
        -rm -f tests/tests_validate-validate.$(OBJEXT)
        -rm -f utilities/animate.$(OBJEXT)
        -rm -f utilities/compare.$(OBJEXT)
@@ -7494,6 +7490,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-monitor.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-montage.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-morphology.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-nt-base.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-nt-feature.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-option.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-paint.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-pixel.Plo@am__quote@
@@ -7808,8 +7806,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@ltdl/loaders/$(DEPDIR)/ltdl_libltdl_la-preopen.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ltdl/loaders/$(DEPDIR)/ltdl_libltdlc_la-preopen.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ltdl/loaders/$(DEPDIR)/shl_load.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/MagickCore_libMagickCore_la-nt-base.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/MagickCore_libMagickCore_la-nt-feature.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/tests_validate-validate.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/animate.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/compare.Po@am__quote@
@@ -8464,19 +8460,19 @@ MagickCore/MagickCore_libMagickCore_la-xwindow.lo: MagickCore/xwindow.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-xwindow.lo `test -f 'MagickCore/xwindow.c' || echo '$(srcdir)/'`MagickCore/xwindow.c
 
-magick/MagickCore_libMagickCore_la-nt-feature.lo: magick/nt-feature.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/MagickCore_libMagickCore_la-nt-feature.lo -MD -MP -MF magick/$(DEPDIR)/MagickCore_libMagickCore_la-nt-feature.Tpo -c -o magick/MagickCore_libMagickCore_la-nt-feature.lo `test -f 'magick/nt-feature.c' || echo '$(srcdir)/'`magick/nt-feature.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) magick/$(DEPDIR)/MagickCore_libMagickCore_la-nt-feature.Tpo magick/$(DEPDIR)/MagickCore_libMagickCore_la-nt-feature.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='magick/nt-feature.c' object='magick/MagickCore_libMagickCore_la-nt-feature.lo' libtool=yes @AMDEPBACKSLASH@
+MagickCore/MagickCore_libMagickCore_la-nt-feature.lo: MagickCore/nt-feature.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-nt-feature.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-nt-feature.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-nt-feature.lo `test -f 'MagickCore/nt-feature.c' || echo '$(srcdir)/'`MagickCore/nt-feature.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-nt-feature.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-nt-feature.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='MagickCore/nt-feature.c' object='MagickCore/MagickCore_libMagickCore_la-nt-feature.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/MagickCore_libMagickCore_la-nt-feature.lo `test -f 'magick/nt-feature.c' || echo '$(srcdir)/'`magick/nt-feature.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-nt-feature.lo `test -f 'MagickCore/nt-feature.c' || echo '$(srcdir)/'`MagickCore/nt-feature.c
 
-magick/MagickCore_libMagickCore_la-nt-base.lo: magick/nt-base.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/MagickCore_libMagickCore_la-nt-base.lo -MD -MP -MF magick/$(DEPDIR)/MagickCore_libMagickCore_la-nt-base.Tpo -c -o magick/MagickCore_libMagickCore_la-nt-base.lo `test -f 'magick/nt-base.c' || echo '$(srcdir)/'`magick/nt-base.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) magick/$(DEPDIR)/MagickCore_libMagickCore_la-nt-base.Tpo magick/$(DEPDIR)/MagickCore_libMagickCore_la-nt-base.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='magick/nt-base.c' object='magick/MagickCore_libMagickCore_la-nt-base.lo' libtool=yes @AMDEPBACKSLASH@
+MagickCore/MagickCore_libMagickCore_la-nt-base.lo: MagickCore/nt-base.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-nt-base.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-nt-base.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-nt-base.lo `test -f 'MagickCore/nt-base.c' || echo '$(srcdir)/'`MagickCore/nt-base.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-nt-base.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-nt-base.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='MagickCore/nt-base.c' object='MagickCore/MagickCore_libMagickCore_la-nt-base.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/MagickCore_libMagickCore_la-nt-base.lo `test -f 'magick/nt-base.c' || echo '$(srcdir)/'`magick/nt-base.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-nt-base.lo `test -f 'MagickCore/nt-base.c' || echo '$(srcdir)/'`MagickCore/nt-base.c
 
 coders/MagickCore_libMagickCore_la-aai.lo: coders/aai.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-aai.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-aai.Tpo -c -o coders/MagickCore_libMagickCore_la-aai.lo `test -f 'coders/aai.c' || echo '$(srcdir)/'`coders/aai.c
@@ -10420,7 +10416,6 @@ clean-libtool:
        -rm -rf filters/.libs filters/_libs
        -rm -rf ltdl/.libs ltdl/_libs
        -rm -rf ltdl/loaders/.libs ltdl/loaders/_libs
-       -rm -rf magick/.libs magick/_libs
        -rm -rf tests/.libs tests/_libs
        -rm -rf utilities/.libs utilities/_libs
 
@@ -11087,8 +11082,6 @@ distclean-generic:
        -rm -f ltdl/$(am__dirstamp)
        -rm -f ltdl/loaders/$(DEPDIR)/$(am__dirstamp)
        -rm -f ltdl/loaders/$(am__dirstamp)
-       -rm -f magick/$(DEPDIR)/$(am__dirstamp)
-       -rm -f magick/$(am__dirstamp)
        -rm -f tests/$(DEPDIR)/$(am__dirstamp)
        -rm -f tests/$(am__dirstamp)
        -rm -f utilities/$(DEPDIR)/$(am__dirstamp)
@@ -11108,7 +11101,7 @@ clean-am: clean-binPROGRAMS clean-checkPROGRAMS \
 
 distclean: distclean-am
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
-       -rm -rf Magick++/demo/$(DEPDIR) Magick++/lib/$(DEPDIR) Magick++/tests/$(DEPDIR) MagickCore/$(DEPDIR) MagickWand/$(DEPDIR) coders/$(DEPDIR) filters/$(DEPDIR) ltdl/$(DEPDIR) ltdl/loaders/$(DEPDIR) magick/$(DEPDIR) tests/$(DEPDIR) utilities/$(DEPDIR)
+       -rm -rf Magick++/demo/$(DEPDIR) Magick++/lib/$(DEPDIR) Magick++/tests/$(DEPDIR) MagickCore/$(DEPDIR) MagickWand/$(DEPDIR) coders/$(DEPDIR) filters/$(DEPDIR) ltdl/$(DEPDIR) ltdl/loaders/$(DEPDIR) tests/$(DEPDIR) utilities/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-hdr distclean-libtool distclean-local distclean-tags
@@ -11162,7 +11155,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-am
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
        -rm -rf $(top_srcdir)/autom4te.cache
-       -rm -rf Magick++/demo/$(DEPDIR) Magick++/lib/$(DEPDIR) Magick++/tests/$(DEPDIR) MagickCore/$(DEPDIR) MagickWand/$(DEPDIR) coders/$(DEPDIR) filters/$(DEPDIR) ltdl/$(DEPDIR) ltdl/loaders/$(DEPDIR) magick/$(DEPDIR) tests/$(DEPDIR) utilities/$(DEPDIR)
+       -rm -rf Magick++/demo/$(DEPDIR) Magick++/lib/$(DEPDIR) Magick++/tests/$(DEPDIR) MagickCore/$(DEPDIR) MagickWand/$(DEPDIR) coders/$(DEPDIR) filters/$(DEPDIR) ltdl/$(DEPDIR) ltdl/loaders/$(DEPDIR) tests/$(DEPDIR) utilities/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic \
        maintainer-clean-local