From 8bcce95d569d0bdf5b3bb93d4b83cde532b4dd14 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Mon, 21 Jul 2003 01:49:50 +0000 Subject: [PATCH] make packages SVN revision: 7206 --- filters/Makefile.am | 8 ++++---- imlib2.spec | 3 ++- loaders/Makefile.am | 34 +++++++++++++++++----------------- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/filters/Makefile.am b/filters/Makefile.am index 3e2e24d..4892f60 100644 --- a/filters/Makefile.am +++ b/filters/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign # A list of all the files in the current directory which can be regenerated MAINTAINERCLEANFILES = Makefile.in -LDFLAGS = -L/usr/X11R6/lib +LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs -L/usr/X11R6/lib INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src \ -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \ -I/usr/X11R6/include $(X_CFLAGS) \ @@ -15,13 +15,13 @@ pkgdir = $(libdir)/loaders/filter pkg_LTLIBRARIES = testfilter.la bump_map.la colormod.la testfilter_la_SOURCES = filter_test.c -testfilter_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src +testfilter_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs testfilter_la_LIBADD = -lImlib2 bump_map_la_SOURCES = filter_bumpmap.c -bump_map_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src +bump_map_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs bump_map_la_LIBADD = -lImlib2 colormod_la_SOURCES = filter_colormod.c -colormod_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src +colormod_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs colormod_la_LIBADD = -lImlib2 diff --git a/imlib2.spec b/imlib2.spec index 986d8b4..490c2d0 100644 --- a/imlib2.spec +++ b/imlib2.spec @@ -1,7 +1,7 @@ Summary: Powerful image loading and rendering library Name: imlib2 Version: 1.1.0 -Release: 0.1 +Release: 1 Copyright: BSD Group: System Environment/Libraries Source: ftp://ftp.enlightenment.org/pub/enlightenment/e17/libs/%{name}-%{version}.tar.gz @@ -144,6 +144,7 @@ test -x /sbin/ldconfig && /sbin/ldconfig %defattr(-,root,root,0755) %{_libdir}/libImlib2.so %{_libdir}/*.a +%{_libdir}/pkgconfig/imlib2.pc %{_includedir}/* %files filters diff --git a/loaders/Makefile.am b/loaders/Makefile.am index 3375fd6..86ca49a 100644 --- a/loaders/Makefile.am +++ b/loaders/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign # A list of all the files in the current directory which can be regenerated MAINTAINERCLEANFILES = Makefile.in -LDFLAGS = -L/usr/X11R6/lib -L$(top_builddir)/src +LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs -L/usr/X11R6/lib INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src \ -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \ -I/usr/X11R6/include $(X_CFLAGS) \ @@ -34,41 +34,41 @@ $(GIF_L) \ pnm.la argb.la bmp.la xpm.la tga.la gzbz2.la jpeg_la_SOURCES = loader_jpeg.c -jpeg_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src +jpeg_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs jpeg_la_LIBADD = @JPEGLIBS@ -lImlib2 png_la_SOURCES = loader_png.c -png_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src +png_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs png_la_LIBADD = @PNGLIBS@ -lImlib2 tiff_la_SOURCES = loader_tiff.c -tiff_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src +tiff_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs tiff_la_LIBADD = @TIFFLIBS@ -lImlib2 gif_la_SOURCES = loader_gif.c -gif_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -gif_la_LIBADD = @GIFLIBS@ +gif_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs +gif_la_LIBADD = @GIFLIBS@ -lImlib2 pnm_la_SOURCES = loader_pnm.c -pnm_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -pnm_la_LIBADD = +pnm_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs +pnm_la_LIBADD = -lImlib2 argb_la_SOURCES = loader_argb.c -argb_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -argb_la_LIBADD = +argb_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs +argb_la_LIBADD = -lImlib2 bmp_la_SOURCES = loader_bmp.c -bmp_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -bmp_la_LIBADD = +bmp_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs +bmp_la_LIBADD = -lImlib2 xpm_la_SOURCES = loader_xpm.c -xpm_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -xpm_la_LIBADD = +xpm_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs +xpm_la_LIBADD = -lImlib2 tga_la_SOURCES = loader_tga.c -tga_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -tga_la_LIBADD = +tga_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs +tga_la_LIBADD = -lImlib2 gzbz2_la_SOURCES = loader_gzbz2.c -gzbz2_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src +gzbz2_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src -L$(top_builddir)/src/.libs gzbz2_la_LIBADD = -lImlib2