[PATCH 04/13] gnu: Export symbols in (gnu packages image) upfront.

[Eric Bavier]

* gnu/packages/image.scm [module]: Export symbols in module definition.
---
 gnu/packages/image.scm |   38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 7a22bf4..2cb64c2 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -33,9 +33,23 @@
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system cmake)
-  #:use-module (srfi srfi-1))
+  #:use-module (srfi srfi-1)
 
-(define-public libpng
+  ;; Export variables up-front to allow circular dependency with the
+  ;; 'ghostscript' module.
+  #:export (libpng
+            libjpeg
+            libjpeg-8
+            libtiff
+            libwmf
+            jbig2dec
+            openjpeg
+            giflib
+            imlib2
+            giblib
+            freeimage))
+
+(define libpng
   (package
    (name "libpng")
    (version "1.5.17")
@@ -62,7 +76,7 @@ library.  It supports almost all PNG features and is 
extensible.")
    (license license:zlib)
    (home-page "http://www.libpng.org/pub/png/libpng.html";)))
 
-(define-public libjpeg
+(define libjpeg
   (package
    (name "libjpeg")
    (version "9a")
@@ -83,7 +97,7 @@ image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file 
formats.")
    (license license:ijg)
    (home-page "http://www.ijg.org/";)))
 
-(define-public libjpeg-8
+(define libjpeg-8
   (package (inherit libjpeg)
    (version "8d")
    (source (origin
@@ -93,7 +107,7 @@ image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file 
formats.")
             (sha256 (base32
                      
"1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0"))))))
 
-(define-public libtiff
+(define libtiff
   (package
    (name "libtiff")
    (version "4.0.3")
@@ -122,7 +136,7 @@ collection of tools for doing simple manipulations of TIFF 
images.")
                                "See COPYRIGHT in the distribution."))
    (home-page "http://www.libtiff.org/";)))
 
-(define-public libwmf
+(define libwmf
   (package
     (name "libwmf")
     (version "0.2.8.4")
@@ -155,7 +169,7 @@ the W3C's XML-based Scaleable Vector Graphic (SVG) format.")
     ;; 'COPYING' is the GPLv2, but file headers say LGPLv2.0+.
     (license license:lgpl2.0+)))
 
-(define-public jbig2dec
+(define jbig2dec
   (package
     (name "jbig2dec")
     (version "0.11")
@@ -184,7 +198,7 @@ work.")
     (home-page "http://jbig2dec.sourceforge.net/";)
     (license license:gpl2+)))
 
-(define-public openjpeg
+(define openjpeg
   (package
     (name "openjpeg")
     (version "2.0.0")
@@ -220,7 +234,7 @@ error-resilience, a Java-viewer for j2k-images, ...")
     (home-page "http://jbig2dec.sourceforge.net/";)
     (license license:bsd-2)))
 
-(define-public giflib
+(define giflib
   (package
     (name "giflib")
     (version "4.2.3")
@@ -268,7 +282,7 @@ compose, and analyze GIF images.")
     (home-page "http://giflib.sourceforge.net/";)
     (license license:x11)))
 
-(define-public imlib2
+(define imlib2
   (package
     (name "imlib2")
     (version "1.4.6")
@@ -316,7 +330,7 @@ This is a complete rewrite over the Imlib 1.x series.  The 
architecture is
 more modular, simple, and flexible.")
     (license license:imlib2)))
 
-(define-public giblib
+(define giblib
   (package
     (name "giblib")
     (version "1.2.4")
@@ -343,7 +357,7 @@ supplies a generic doubly-linked list and some string 
functions.")
     (license (license:x11-style "file://COPYING"
                                 "See 'COPYING' in the distribution."))))
 
-(define-public freeimage
+(define freeimage
   (package
    (name "freeimage")
    (version "3.16.0")
-- 
1.7.9.5