From 38f428304ebe526dc4e790cd4820e0b43b1351a7 Mon Sep 17 00:00:00 2001
From: Mark Crichton <crichton@src.gnome.org>
Date: Mon, 12 Jul 1999 05:40:02 +0000
Subject: [PATCH] Some changes to do a "proper" install.

Some changes to do a "proper" install.

Makefile doesnt work, however.
---
 gdk-pixbuf/Makefile.am     | 54 ++++++++++++++++++++------------------
 gdk-pixbuf/gdk-pixbuf-io.c |  2 --
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 93726c10db..eb05ce77de 100644
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -1,13 +1,7 @@
-
-lib_LTLIBRARIES = 		\
-	libgdk-pixbuf.la	\
-	libpixbuf-png.la	\
-	libpixbuf-jpeg.la	\
-	libpixbuf-gif.la	\
-	libpixbuf-xpm.la	\
-	libpixbuf-tiff.la
-
+common_ldflags = -aviod-version
 noinst_PROGRAMS = testpixbuf
+loader_dir=$(libdir)/gdk-pixbuf/loaders
+DEFS = -DPIXBUF_LIBDIR="$(loader_dir)"
 DEPS = libgdk-pixbuf.la
 LDADDS = libgdk-pixbuf.la @GNOME_LIBDIR@ @GNOMEUI_LIBS@
 
@@ -30,35 +24,45 @@ libgdk_pixbufinclude_HEADERS =	\
 #
 # The PNG plugin.
 #
-libpixbuf_png_la_SOURCES = 	\
-	io-png.c
-libpixbuf_png_la_LDFLAGS = -avoid-version
-libpixbuf_png_la_LIBADD = -lpng -lz
+libpixbuf_png_la_SOURCES = io-png.c
+libpixbuf_png_la_LDFLAGS = $(common_ldflags)
+libpixbuf_png_la_LIBADD = $(PNGLIBS)
 
 #
 # The JPEG loader
 #
-libpixbuf_jpeg_la_SOURCES =	\
-	io-jpeg.c
-libpixbuf_jpeg_la_LDFLAGS = -avoid-version
-libpixbuf_jpeg_la_LIBADD = -ljpeg
+libpixbuf_jpeg_la_SOURCES = io-jpeg.c
+libpixbuf_jpeg_la_LDFLAGS = $(common_ldflags)
+libpixbuf_jpeg_la_LIBADD = $(JPEGLIBS)
 
 #
 # The XPM loader
 #
-libpixbuf_xpm_la_SOURCES =	\
-	io-xpm.c
+libpixbuf_xpm_la_SOURCES = io-xpm.c
+libpixbuf_xpm_la_LDFLAGS = $(common_ldflags)
+libpixbuf_xpm_la_LIBADD =
+
 
 #
 # The GIF loader
 #
-libpixbuf_gif_la_SOURCES =	\
-	io-gif.c
-libpixbuf_gif_la_LDFLAGS = -avoid-version
-libpixbuf_gif_la_LIBADD= -lungif
+libpixbuf_gif_la_SOURCES = io-gif.c
+libpixbuf_gif_la_LDFLAGS = $(common_ldflags)
+libpixbuf_gif_la_LIBADD= $(GIFLIB)
 
 #
 # The TIFF loader
 #
-libpixbuf_tiff_la_SOURCES=	\
-	io-tiff.c
+libpixbuf_tiff_la_SOURCES = io-tiff.c
+libpixbuf_tiff_la_LDFLAGS = $(common_ldflags)
+libpixbuf_tiff_la_LIBADD = $(TIFFLIB)
+
+lib_LTLIBRARIES =               \
+        libgdk-pixbuf.la 
+
+libpixbufloader_DATA =		\
+	libpixbuf-tiff.la	\
+	libpixbuf-gif.la	\
+	libpixbuf-xpm.la	\
+	libpixbuf-jpeg.la	\
+	libpixbuf-png.la
diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index 5895486d4f..257a454f12 100644
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -10,8 +10,6 @@
 #include <gmodule.h>
 #include "gdk-pixbuf.h"
 
-#define PIXBUF_LIBDIR "."
-
 static gboolean
 pixbuf_check_png (unsigned char *buffer, int size)
 {