diff --git a/Makefile.am b/Makefile.am index 1b11508..7348a89 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,22 +1,38 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = src data doc debian +SUBDIRS = src data doc MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \ config.h.in config.sub configure install-sh \ ltconfig ltmain.sh missing mkinstalldirs \ - stamp-h.in imlib2_docs.tar imlib2_docs.tar.gz imlib2.c - -dist-hook: - ./gendoc; \ - tar cvf imlib2_docs.tar doc; \ - rm -f imlib2_docs.tar.gz; \ - gzip -9 imlib2_docs.tar; - + stamp-h.in build-stamp configure-stamp depcomp \ + imlib2_docs.tar.gz imlib2.c \ + README \ + imlib2.pc \ + imlib2.spec \ + imlib2.oe imlib2-native.oe \ + imlib2.bb imlib2Xnative.bb \ + debian/changelog bin_SCRIPTS = imlib2-config -EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN TODO imlib2.spec imlib2.c.in imlib2.pc.in gendoc Doxyfile imlib2_docs.tar.gz +EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN imlib2.spec imlib2.spec.in gendoc \ + Doxyfile \ + README.in README \ + imlib2.pc.in \ + imlib2.spec.in imlib2.spec \ + imlib2.oe.in imlib2.oe imlib2-native.oe.in imlib2-native.oe \ + imlib2.bb.in imlib2.bb imlib2Xnative.bb.in imlib2Xnative.bb \ + debian/changelog.in debian/changelog \ + debian/control \ + debian/copyright \ + debian/imlib2-config.1 \ + debian/imlib2-demo.install \ + debian/imlib2-test.install \ + debian/libimlib2-dev.doc-base \ + debian/libimlib2-dev.install \ + debian/libimlib2.install \ + debian/rules pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = imlib2.pc diff --git a/README b/README.in similarity index 58% rename from README rename to README.in index b9b8086..ed3c930 100644 --- a/README +++ b/README.in @@ -1,8 +1,4 @@ -############################################################################### -# # -# I M L I B 2 # -# # -############################################################################### +Imlib2 @VERSION@ This is the Imlib 2 library - a library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support, etc. @@ -21,21 +17,38 @@ libjpeg http://www.ijg.org/ libpng http://www.libpng.org/pub/png/libpng.html freetype 2.1.x http://www.freetype.org/ - For examples of this library in use, seek: Eterm http://www.eterm.org/ (CVS version only, currently) feh http://www.linuxbrit.co.uk/feh.html geist http://www.linuxbrit.co.uk/geist.html +------------------------------------------------------------------------------ +COMPILING AND INSTALLING: -A blurb about each of the directories: + ./configure + make +(as root unless youa re installing in your users directories): + make install + +------------------------------------------------------------------------------ +BUILDING PACKAGES: -debian/ Debian build files -demo/ Demo view program -doc/ Documentation for imlib2, primarily in html -filters/ Filter shared objects -libltdl/ Libtool LGPL-licensed loadable module support library source -loaders/ Imlib2's image loader-savers (jpg, png, etc) -src/ Imlib2 main source -test/ Test program(s) +RPM: To build rpm packages: + + sudo rpm -ta @PACKAGE@-@VERSION@.tar.gz + +You will find rpm packages in your system /usr/src/redhat/* dirs (note you may +not need to use sudo or root if you have your own ~/.rpmrc. see rpm documents +for more details) + +DEB: To build deb packages: + + tar zvf @PACKAGE@-@VERSION@.tar.gz + cd @PACKAGE@-@VERSION@ + dpkg-buildpackage -us -uc -rfakeroot + cd .. + rm -rf @PACKAGE@-@VERSION@ + +You will find all the debian source, binary etc. packages put in the directory +where you first untarred the source tarball. diff --git a/configure.in b/configure.in index 2b71323..23b743f 100644 --- a/configure.in +++ b/configure.in @@ -359,6 +359,7 @@ AC_SUBST(requirements) AC_OUTPUT([ Makefile +imlib2.pc src/Makefile src/lib/Makefile src/bin/Makefile @@ -369,12 +370,16 @@ data/Makefile data/fonts/Makefile data/images/Makefile doc/Makefile -debian/Makefile imlib2-config -imlib2.pc +README +imlib2.spec +imlib2.oe +imlib2-native.oe +imlib2.bb +imlib2Xnative.bb +debian/changelog ],[ chmod +x imlib2-config -touch imlib2_docs.tar.gz ]) ##################################################################### diff --git a/debian/Makefile.am b/debian/Makefile.am deleted file mode 100644 index b479109..0000000 --- a/debian/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -EXTRA_DIST = \ -changelog \ -control \ -copyright \ -imlib2-config.1 \ -imlib2-demo.install \ -imlib2-test.install \ -libimlib2-dev.doc-base \ -libimlib2-dev.install \ -libimlib2.install \ -rules diff --git a/debian/changelog b/debian/changelog.in similarity index 68% rename from debian/changelog rename to debian/changelog.in index 200c594..ae5be03 100644 --- a/debian/changelog +++ b/debian/changelog.in @@ -1,4 +1,4 @@ -imlib2 (1.2.1-0cvs20050129) unstable; urgency=low +imlib2 (@VERSION@-1) unstable; urgency=low * a CVS release diff --git a/imlib2-native.oe b/imlib2-native.oe.in similarity index 100% rename from imlib2-native.oe rename to imlib2-native.oe.in diff --git a/imlib2.bb b/imlib2.bb.in similarity index 98% rename from imlib2.bb rename to imlib2.bb.in index 2e2dc68..4f2319d 100644 --- a/imlib2.bb +++ b/imlib2.bb.in @@ -5,7 +5,7 @@ MAINTAINER = "Carsten Haitzler (Rasterman) " SECTION = "e/libs" PRIORITY = "optional" DEPENDS = "freetype libpng jpeg" -PV = "1.2.0" +PV = "@VERSION@" PR = "1" do_prepsources () { diff --git a/imlib2.oe b/imlib2.oe.in similarity index 98% rename from imlib2.oe rename to imlib2.oe.in index 2e2dc68..4f2319d 100644 --- a/imlib2.oe +++ b/imlib2.oe.in @@ -5,7 +5,7 @@ MAINTAINER = "Carsten Haitzler (Rasterman) " SECTION = "e/libs" PRIORITY = "optional" DEPENDS = "freetype libpng jpeg" -PV = "1.2.0" +PV = "@VERSION@" PR = "1" do_prepsources () { diff --git a/imlib2.spec b/imlib2.spec.in similarity index 89% rename from imlib2.spec rename to imlib2.spec.in index a2c6ffa..0d3019f 100644 --- a/imlib2.spec +++ b/imlib2.spec.in @@ -1,11 +1,11 @@ Summary: Powerful image loading and rendering library Name: imlib2 -Version: 1.2.0 -Release: 2.%(date '+%Y%m%d') +Version: @VERSION@ +Release: 1 License: BSD Group: System Environment/Libraries URL: http://www.enlightenment.org -Source: ftp://ftp.enlightenment.org/pub/enlightenment/e17/libs/%{name}-%{version}.tar.gz +Source: %{name}-%{version}.tar.gz Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings } Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)} Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}} @@ -123,7 +123,7 @@ gz compressed image loader/saver for Imlib2 --disable-mmx \ %endif $RPM_CONFIGURE_OPTS -%{__make} LDFLAGS="$LDFLAGS -L/usr/X11R6/%{_lib}" %{?_smp_mflags} %{?mflags} +%{__make} %{?_smp_mflags} %{?mflags} %install %{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install @@ -139,22 +139,17 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) -%doc AUTHORS COPYING README ChangeLog doc/index.html doc/imlib2.gif doc/blank.gif +%doc AUTHORS COPYING COPYING-PLAIN README %{_libdir}/lib*.so.* -/usr/share/imlib2/data/fonts/*.ttf -/usr/share/imlib2/data/images/*.png -%{_bindir}/* +%{_libdir}/*.la +%{_datadir}/%{name} %files devel %defattr(-, root, root, 0755) -%{_libdir}/libImlib2.so +%{_libdir}/*.so %{_libdir}/*.a -%{_libdir}/imlib2/loaders/*.a -%{_libdir}/imlib2/loaders/*.la -%{_libdir}/imlib2/filters/*.a -%{_libdir}/imlib2/filters/*.la -%{_libdir}/*.la -%{_libdir}/pkgconfig/imlib2.pc +%{_bindir}/imlib2-config +%{_libdir}/pkgconfig/* %{_includedir}/* %files filters diff --git a/imlib2Xnative.bb b/imlib2Xnative.bb.in similarity index 100% rename from imlib2Xnative.bb rename to imlib2Xnative.bb.in