Bug 513681 - part 5 - move the decoders out of their subdirectories.r=joe,a=blocker

--HG--
rename : modules/libpr0n/decoders/gif/GIF2.h => modules/libpr0n/decoders/GIF2.h
rename : modules/libpr0n/decoders/jpeg/iccjpeg.c => modules/libpr0n/decoders/iccjpeg.c
rename : modules/libpr0n/decoders/jpeg/iccjpeg.h => modules/libpr0n/decoders/iccjpeg.h
rename : modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp => modules/libpr0n/decoders/nsBMPDecoder.cpp
rename : modules/libpr0n/decoders/bmp/nsBMPDecoder.h => modules/libpr0n/decoders/nsBMPDecoder.h
rename : modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp => modules/libpr0n/decoders/nsGIFDecoder2.cpp
rename : modules/libpr0n/decoders/gif/nsGIFDecoder2.h => modules/libpr0n/decoders/nsGIFDecoder2.h
rename : modules/libpr0n/decoders/bmp/nsICODecoder.cpp => modules/libpr0n/decoders/nsICODecoder.cpp
rename : modules/libpr0n/decoders/bmp/nsICODecoder.h => modules/libpr0n/decoders/nsICODecoder.h
rename : modules/libpr0n/decoders/bmp/nsIconDecoder.cpp => modules/libpr0n/decoders/nsIconDecoder.cpp
rename : modules/libpr0n/decoders/bmp/nsIconDecoder.h => modules/libpr0n/decoders/nsIconDecoder.h
rename : modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp => modules/libpr0n/decoders/nsJPEGDecoder.cpp
rename : modules/libpr0n/decoders/jpeg/nsJPEGDecoder.h => modules/libpr0n/decoders/nsJPEGDecoder.h
rename : modules/libpr0n/decoders/png/nsPNGDecoder.cpp => modules/libpr0n/decoders/nsPNGDecoder.cpp
rename : modules/libpr0n/decoders/png/nsPNGDecoder.h => modules/libpr0n/decoders/nsPNGDecoder.h

modules/libpr0n/build/Makefile.in

@@ -50,8 +50,6 @@ MODULE_NAME	= nsImageLib2Module
 GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
-DECODERS = png gif jpeg bmp
-
 CPPSRCS = \
 		nsImageModule.cpp \
 		$(NULL)
@@ -59,16 +57,13 @@ CPPSRCS = \
 LOCAL_INCLUDES	= \
 		-I. \
 		-I$(srcdir)/../src \
-		$(foreach d,$(filter-out icon,$(DECODERS)), \
-			-I$(srcdir)/../decoders/${d}) \
 		$(foreach d,$(MOZ_IMG_ENCODERS), \
 			-I$(srcdir)/../encoders/${d}) \
 		$(NULL)
 
 SHARED_LIBRARY_LIBS = \
 		../src/$(LIB_PREFIX)imglib2_s.$(LIB_SUFFIX) \
-		$(foreach d,$(filter-out icon,$(DECODERS)), \
-			../decoders/${d}/$(LIB_PREFIX)img${d}_s.$(LIB_SUFFIX))\
+		../decoders/$(LIB_PREFIX)imgdecoders_s.$(LIB_SUFFIX) \
 		$(foreach d,$(MOZ_IMG_ENCODERS), \
 			../encoders/${d}/$(LIB_PREFIX)img${d}e_s.$(LIB_SUFFIX))\
 		$(NULL)

modules/libpr0n/decoders/Makefile.in

@@ -42,8 +42,32 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DECODERS = png gif jpeg bmp
+MODULE = imgdecoders
+LIBRARY_NAME = imgdecoders_s
+FORCE_STATIC_LIB = 1
+MODULE_NAME = nsDecodersModule
+LIBXUL_LIBRARY  = 1
 
+
+CPPSRCS = nsPNGDecoder.cpp nsJPEGDecoder.cpp nsGIFDecoder2.cpp \
+          nsBMPDecoder.cpp nsICODecoder.cpp nsIconDecoder.cpp \
+          $(NULL)
+
+CSRCS   = iccjpeg.c \
+          $(NULL)
+
+# Decoders need RasterImage.h
+LOCAL_INCLUDES += -I$(topsrcdir)/modules/libpr0n/src/
+
+# PNG read/write stuff
+ifneq (,$(filter png,$(MOZ_IMG_ENCODERS)))
+DEFINES		+= -DMOZ_PNG_WRITE
+endif
+DEFINES		+= -DMOZ_PNG_READ
+
+
+# The Icon Channel stuff really shouldn't live in decoders/icon, but we'll
+# fix that another time.
 ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
 DIRS = icon/gtk icon
 endif
@@ -63,7 +87,5 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 DIRS = icon/mac icon
 endif
 
-DIRS += $(DECODERS)
-
 include $(topsrcdir)/config/rules.mk
 

modules/libpr0n/decoders/bmp/Makefile.in

@@ -1,58 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Christian Biesinger <cbiesinger@web.de>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= imgbmp
-LIBRARY_NAME	= imgbmp_s
-FORCE_STATIC_LIB = 1
-MODULE_NAME	= nsBMPModule
-LIBXUL_LIBRARY  = 1
-
-
-CPPSRCS        = nsBMPDecoder.cpp nsICODecoder.cpp nsIconDecoder.cpp
-
-# ns[BMP,ICO,Icon]Decoder.cpp all include RasterImage.h
-LOCAL_INCLUDES += -I$(topsrcdir)/modules/libpr0n/src/
-
-include $(topsrcdir)/config/rules.mk

modules/libpr0n/decoders/gif/Makefile.in

@@ -1,59 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= imggif
-LIBRARY_NAME	= imggif_s
-FORCE_STATIC_LIB = 1
-MODULE_NAME	= nsGIFModule2
-LIBXUL_LIBRARY = 1
-
-
-CPPSRCS		= nsGIFDecoder2.cpp
-
-# nsGIFDecoder2.cpp includes RasterImage.h
-LOCAL_INCLUDES += -I$(topsrcdir)/modules/libpr0n/src
-
-include $(topsrcdir)/config/rules.mk
-
-CXXFLAGS += $(MOZ_CAIRO_CFLAGS)

modules/libpr0n/decoders/jpeg/Makefile.in

@@ -1,60 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= imgjpeg
-LIBRARY_NAME	= imgjpeg_s
-FORCE_STATIC_LIB = 1
-MODULE_NAME	= nsJPEGDecoderModule
-LIBXUL_LIBRARY  = 1
-
-
-CPPSRCS		= nsJPEGDecoder.cpp
-
-CSRCS		= iccjpeg.c
-
-# nsJPEGDecoder.cpp includes RasterImage.h
-LOCAL_INCLUDES += -I$(topsrcdir)/modules/libpr0n/src/
-
-include $(topsrcdir)/config/rules.mk
-

modules/libpr0n/decoders/png/Makefile.in

@@ -1,64 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= imgpng
-LIBRARY_NAME	= imgpng_s
-FORCE_STATIC_LIB = 1
-MODULE_NAME	= nsPNGDecoderModule
-LIBXUL_LIBRARY = 1
-
-EXTRA_DSO_LIBS	= gkgfx
-
-CPPSRCS		= nsPNGDecoder.cpp
-
-ifneq (,$(filter png,$(MOZ_IMG_ENCODERS)))
-DEFINES		+= -DMOZ_PNG_WRITE
-endif
-
-DEFINES		+= -DMOZ_PNG_READ
-
-# nsPNGDecoder.cpp includes RasterImage.h
-LOCAL_INCLUDES += -I$(topsrcdir)/modules/libpr0n/src/
-
-include $(topsrcdir)/config/rules.mk

modules/libpr0n/src/Makefile.in

@@ -62,10 +62,8 @@ CPPSRCS		= \
                         imgStatusTracker.cpp \
 			$(NULL)
 
-LOCAL_INCLUDES += -I$(topsrcdir)/modules/libpr0n/decoders/bmp
-LOCAL_INCLUDES += -I$(topsrcdir)/modules/libpr0n/decoders/gif
-LOCAL_INCLUDES += -I$(topsrcdir)/modules/libpr0n/decoders/jpeg
-LOCAL_INCLUDES += -I$(topsrcdir)/modules/libpr0n/decoders/png
+# We need to instantiate the decoders
+LOCAL_INCLUDES += -I$(topsrcdir)/modules/libpr0n/decoders
 
 include $(topsrcdir)/config/rules.mk