[Digikam-devel] extragear/graphics/digikam/libs/dimg

[Gilles Caulier]

SVN commit 483112 by cgilles:

digiKam 0.9.0 from trunk : Make a dedicaced DImg loaders directory to separate from DImg core implementation. It's more readable.
CCMAIL: digikam-devel at kde.org

 M  +8 -9      Makefile.am  
 D             iccjpeg.c  
 D             iccjpeg.h  
 D             jpegloader.cpp  
 D             jpegloader.h  
 A             loaders (directory)  
 A             loaders/Makefile.am  
 A             loaders/iccjpeg.c   [License: no copyright]
 A             loaders/iccjpeg.h   [License: no copyright]
 A             loaders/jpegloader.cpp   [License: GPL]
 A             loaders/jpegloader.h   [License: GPL]
 A             loaders/pamloader.cpp   [License: GPL]
 A             loaders/pamloader.h   [License: GPL]
 A             loaders/pngloader.cpp   [License: GPL]
 A             loaders/pngloader.h   [License: GPL]
 A             loaders/ppmloader.cpp   [License: GPL]
 A             loaders/ppmloader.h   [License: GPL]
 A             loaders/qimageloader.cpp   [License: GPL]
 A             loaders/qimageloader.h   [License: GPL]
 A             loaders/rawloader.cpp   [License: GPL]
 A             loaders/rawloader.h   [License: GPL]
 A             loaders/tiffloader.cpp   [License: GPL]
 A             loaders/tiffloader.h   [License: GPL]
 D             pamloader.cpp  
 D             pamloader.h  
 D             pngloader.cpp  
 D             pngloader.h  
 D             ppmloader.cpp  
 D             ppmloader.h  
 D             qimageloader.cpp  
 D             qimageloader.h  
 D             rawloader.cpp  
 D             rawloader.h  
 D             tiffloader.cpp  
 D             tiffloader.h  


--- trunk/extragear/graphics/digikam/libs/dimg/Makefile.am #483111:483112
@@ -1,3 +1,4 @@
+SUBDIRS = loaders
 METASOURCES = AUTO
 
 noinst_LTLIBRARIES = libdimg.la
@@ -3,14 +4,12 @@
 
 libdimg_la_SOURCES = dimg.cpp dimgloader.cpp dimgscale.cpp colormodifier.cpp \
-	             jpegloader.cpp tiffloader.cpp rawloader.cpp pngloader.cpp \
-	             ppmloader.cpp qimageloader.cpp iccjpeg.c icctransform.cpp 
-             
-libdimg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) \
-		     $(LIBJPEG) $(LIB_TIFF) $(LCMS_LIBS) \
-	             $(top_builddir)/digikam/libs/dcraw/libdcraw.la 
-	                    
-INCLUDES = $(all_includes) 
+	                 icctransform.cpp 
 
-digikaminclude_HEADERS = dimg.h dimgloader.h colormodifier.h icctransform.h
+libdimg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LCMS_LIBS) \
+	                 $(top_builddir)/digikam/libs/dcraw/libdcraw.la \
+	                 $(top_builddir)/digikam/libs/dimg/loaders/libdimgloaders.la 
 
+INCLUDES = $(all_includes) -I$(top_srcdir)/digikam/libs/dimg/loaders 
+
+digikaminclude_HEADERS = dimg.h dimgloader.h colormodifier.h icctransform.h 
 digikamincludedir = $(includedir)/digikam