diff options
29 files changed, 62 insertions, 1923 deletions
diff --git a/classes/efl.bbclass b/classes/efl.bbclass index 120f26f6ce..2f6838ab13 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -15,6 +15,22 @@ libdirectory = "src/lib" libraries = "lib${SRCNAME}" headers = "${@bb.data.getVar('SRCNAME',d,1).capitalize()}.h" +def binconfig_suffix(d): + import bb + return ["","-native"][bb.data.inherits_class('native', d)] + +export CURL_CONFIG = "${STAGING_BINDIR}/curl-config${@binconfig_suffix(d)}" +export EDB_CONFIG = "${STAGING_BINDIR}/edb-config${@binconfig_suffix(d)}" +export EET_CONFIG = "${STAGING_BINDIR}/eet-config${@binconfig_suffix(d)}" +export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config${@binconfig_suffix(d)}" +export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config${@binconfig_suffix(d)}" +export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config${@binconfig_suffix(d)}" +export EPSILON_CONFIG = "${STAGING_BINDIR}/epsilon-config${@binconfig_suffix(d)}" +export EPEG_CONFIG = "${STAGING_BINDIR}/epeg-config${@binconfig_suffix(d)}" +export ESMART_CONFIG = "${STAGING_BINDIR}/esmart-config${@binconfig_suffix(d)}" +export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}" +export IMLIB2_CONFIG = "${STAGING_BINDIR}/imlib2-config${@binconfig_suffix(d)}" + do_stage_append () { for i in ${libraries} do diff --git a/packages/efl/ecore-fb_0.9.9.013.bb b/packages/efl/ecore-fb_0.9.9.013.bb index 152cd5c4fd..f0f74734a9 100644 --- a/packages/efl/ecore-fb_0.9.9.013.bb +++ b/packages/efl/ecore-fb_0.9.9.013.bb @@ -1,4 +1,5 @@ include ecore.inc +PROVIDES += "virtual/ecore" PR = "r0" EXTRA_OECONF = "--enable-ecore-fb \ diff --git a/packages/efl/ecore-native_0.9.9.013.bb b/packages/efl/ecore-native_0.9.9.013.bb index a90f508004..30b6f78370 100644 --- a/packages/efl/ecore-native_0.9.9.013.bb +++ b/packages/efl/ecore-native_0.9.9.013.bb @@ -1,9 +1,3 @@ include ecore-fb_${PV}.bb inherit native DEPENDS = "curl-native edb-native eet-native evas-native freetype-native" - -export CURL_CONFIG = "${STAGING_BINDIR}/curl-config-native" -export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config-native" -export EDB_CONFIG = "${STAGING_BINDIR}/edb-config-native" -export EET_CONFIG = "${STAGING_BINDIR}/eet-config-native" -export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config-native" diff --git a/packages/efl/ecore-x11_0.9.9.013.bb b/packages/efl/ecore-x11_0.9.9.013.bb index b21efb588e..8a86aa0138 100644 --- a/packages/efl/ecore-x11_0.9.9.013.bb +++ b/packages/efl/ecore-x11_0.9.9.013.bb @@ -1,4 +1,5 @@ include ecore.inc +PROVIDES += "virtual/ecore" DEPENDS += "evas-x11" PR = "r1" diff --git a/packages/efl/ecore.inc b/packages/efl/ecore.inc index a8ef0ec982..8b3ae5e5b7 100644 --- a/packages/efl/ecore.inc +++ b/packages/efl/ecore.inc @@ -2,15 +2,15 @@ DESCRIPTION = "Ecore is the core event abstraction layer for the enlightenment \ foundation libraries. It makes makes doing selections, drag and drop, event loops, \ timeouts and idle handlers fast, optimized, and convenient." LEAD_SONAME = "libecore.so" -PROVIDES = "virtual/ecore" LICENSE = "MIT" DEPENDS = "curl edb eet virtual/evas freetype edb-native" inherit efl SRC_URI = "http://enlightenment.freedesktop.org/files/ecore-${PV}.tar.gz \ - file://ecore-configure.patch;patch=1" + file://configure.patch;patch=1" S = "${WORKDIR}/ecore-${PV}" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore" EXTRA_OECONF = "<override me>" diff --git a/packages/esmart/.mtn2git_empty b/packages/efl/ecore/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/esmart/.mtn2git_empty +++ b/packages/efl/ecore/.mtn2git_empty diff --git a/packages/efl/ecore/configure.patch b/packages/efl/ecore/configure.patch new file mode 100644 index 0000000000..a9ae62743d --- /dev/null +++ b/packages/efl/ecore/configure.patch @@ -0,0 +1,27 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- ecore-0.9.9.013/configure.in~configure.patch ++++ ecore-0.9.9.013/configure.in +@@ -15,7 +15,6 @@ + AC_CHECK_SIZEOF(int, 4) + AM_ENABLE_SHARED + AM_PROG_LIBTOOL +-AC_C___ATTRIBUTE__ + + if test "x${bindir}" = 'x${exec_prefix}/bin'; then + if test "x${exec_prefix}" = "xNONE"; then +@@ -247,10 +246,8 @@ + AM_CONDITIONAL(BUILD_ECORE_X, true) + AC_DEFINE(BUILD_ECORE_X, 1, [Build Ecore_X Module]) + BUILD_ECORE_X=1 +- x_dir=${x_dir:-/usr/X11R6} +- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} +- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" + x_ldflags=" "$ecore_x_libs; ++ x_libs="-lX11 -lXext"; + ecore_x_libs="-lecore_x"; + ],[ + AM_CONDITIONAL(BUILD_ECORE_X, false) diff --git a/packages/esmart/files/.mtn2git_empty b/packages/efl/epsilon/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/esmart/files/.mtn2git_empty +++ b/packages/efl/epsilon/.mtn2git_empty diff --git a/packages/efl/files/compile-fix.patch b/packages/efl/epsilon/compile-fix.patch index 1c42cc59c4..1c42cc59c4 100644 --- a/packages/efl/files/compile-fix.patch +++ b/packages/efl/epsilon/compile-fix.patch diff --git a/packages/efl/esmart/.mtn2git_empty b/packages/efl/esmart/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/efl/esmart/.mtn2git_empty diff --git a/packages/esmart/files/compile-fix.patch b/packages/efl/esmart/compile-fix.patch index 08ca835aa7..08ca835aa7 100644 --- a/packages/esmart/files/compile-fix.patch +++ b/packages/efl/esmart/compile-fix.patch diff --git a/packages/efl/esmart_0.9.0.004.bb b/packages/efl/esmart_0.9.0.004.bb index 781442201b..9fe0ac9e35 100644 --- a/packages/efl/esmart_0.9.0.004.bb +++ b/packages/efl/esmart_0.9.0.004.bb @@ -7,6 +7,9 @@ inherit efl SRC_URI += "file://compile-fix.patch;patch=1" +headers = "" +libraries = "" + myheaders = "esmart_container/Esmart_Container.h \ esmart_draggies/Esmart_Draggies.h \ esmart_file_dialog/Esmart_File_Dialog.h \ diff --git a/packages/efl/evas-fb_0.9.9.013.bb b/packages/efl/evas-fb_0.9.9.013.bb index 2a9a02e1ca..8086d0e95a 100644 --- a/packages/efl/evas-fb_0.9.9.013.bb +++ b/packages/efl/evas-fb_0.9.9.013.bb @@ -1,4 +1,5 @@ include evas.inc +PROVIDES += "virtual/evas" PR = "r0" EXTRA_OECONF = "--enable-fb \ diff --git a/packages/efl/evas-native_0.9.9.013.bb b/packages/efl/evas-native_0.9.9.013.bb index e17c1b3a95..a29967a051 100644 --- a/packages/efl/evas-native_0.9.9.013.bb +++ b/packages/efl/evas-native_0.9.9.013.bb @@ -1,7 +1,3 @@ include evas-fb_${PV}.bb inherit native DEPENDS = "freetype-native" - -export EDB_CONFIG = "${STAGING_BINDIR}/edb-config-native" -export EET_CONFIG = "${STAGING_BINDIR}/eet-config-native" -export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config-native" diff --git a/packages/efl/evas-x11_0.9.9.013.bb b/packages/efl/evas-x11_0.9.9.013.bb index 68eadd6ae6..3d37d23cde 100644 --- a/packages/efl/evas-x11_0.9.9.013.bb +++ b/packages/efl/evas-x11_0.9.9.013.bb @@ -1,4 +1,5 @@ include evas.inc +PROVIDES += "virtual/evas" DEPENDS += "x11 xext" PR = "r2" diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc index 6172fde192..0588d8e28c 100644 --- a/packages/efl/evas.inc +++ b/packages/efl/evas.inc @@ -3,14 +3,15 @@ anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \ down to using normal X11 primitives such as pixmaps, lines and rectangles if \ your CPU or graphics hardware are too slow." LICENSE = "MIT" -PROVIDES = "virtual/evas" DEPENDS = "libpng jpeg edb eet freetype" inherit efl SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \ + file://fix-configure.patch;patch=1 \ file://pkg.m4" S = "${WORKDIR}/evas-${PV}" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas" EXTRA_OECONF = "<override me>" diff --git a/packages/efl/ewl/.mtn2git_empty b/packages/efl/ewl/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/efl/ewl/.mtn2git_empty diff --git a/packages/efl/files/ewl-configure.patch b/packages/efl/ewl/ewl-configure.patch index a754e0f819..a754e0f819 100644 --- a/packages/efl/files/ewl-configure.patch +++ b/packages/efl/ewl/ewl-configure.patch diff --git a/packages/efl/ewl_0.0.4.004.bb b/packages/efl/ewl_0.0.4.004.bb index 6377575120..e9b1516a8c 100644 --- a/packages/efl/ewl_0.0.4.004.bb +++ b/packages/efl/ewl_0.0.4.004.bb @@ -8,8 +8,6 @@ inherit efl SRC_URI += "file://ewl-configure.patch;patch=1" -export CURL_CONFIG = "${STAGING_BINDIR}/curl-config" - do_configure() { gnu-configize oe_runconf diff --git a/packages/efl/files/binconfig.patch b/packages/efl/files/binconfig.patch deleted file mode 100644 index 9383d581cd..0000000000 --- a/packages/efl/files/binconfig.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: imlib2-1.2.0/imlib2-config.in -=================================================================== ---- imlib2-1.2.0.orig/imlib2-config.in 2004-11-01 04:39:42.000000000 -0500 -+++ imlib2-1.2.0/imlib2-config.in 2005-03-12 19:39:48.283569432 -0500 -@@ -3,6 +3,8 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - exec_prefix_set=no -+libdir=@libdir@ -+includedir=@includedir@ - - usage="\ - Usage: imlib2-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]" -@@ -39,13 +41,13 @@ - echo @VERSION@ - ;; - --cflags) -- if test @includedir@ != /usr/include ; then -- includes=-I@includedir@ -+ if test ${includedir} != /usr/include ; then -+ includes=-I${includedir} - fi - echo $includes - ;; - --libs) -- libdirs=-L@libdir@ -+ libdirs=-L${libdir} - echo $libdirs -lImlib2 @my_libs@ - ;; - *) diff --git a/packages/efl/files/dirs.patch b/packages/efl/files/dirs.patch deleted file mode 100644 index 8b0b5281d1..0000000000 --- a/packages/efl/files/dirs.patch +++ /dev/null @@ -1,37 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- epeg/src/lib/Makefile.am~dirs 2004-01-19 18:53:41.000000000 -0600 -+++ epeg/src/lib/Makefile.am 2004-07-13 16:29:16.000000000 -0500 -@@ -5,10 +5,7 @@ - # A list of all the files in the current directory which can be regenerated - MAINTAINERCLEANFILES = Makefile.in - --LDFLAGS = -L/usr/local/lib --INCLUDES = -I/usr/local/include \ -- -I$(includedir) \ -- @my_includes@ -+INCLUDES = @my_includes@ - - lib_LTLIBRARIES = libepeg.la - include_HEADERS = Epeg.h -@@ -17,6 +14,6 @@ - epeg_memfile.c \ - epeg_private.h - --libepeg_la_LIBADD = $(LDFLAGS) @my_libs@ -+libepeg_la_LIBADD = @my_libs@ - libepeg_la_DEPENDENCIES = $(top_builddir)/config.h - libepeg_la_LDFLAGS = -version-info 9:0:9 ---- epeg/src/bin/Makefile.am~dirs 2004-07-08 10:42:50.000000000 -0500 -+++ epeg/src/bin/Makefile.am 2004-07-13 16:29:21.000000000 -0500 -@@ -2,7 +2,6 @@ - - INCLUDES = \ - -I../lib \ ---I/usr/local/include \ - -I$(top_srcdir)/src/lib \ - @my_includes@ - diff --git a/packages/efl/files/ecore-configure.patch b/packages/efl/files/ecore-configure.patch deleted file mode 100644 index abaa4e10a4..0000000000 --- a/packages/efl/files/ecore-configure.patch +++ /dev/null @@ -1,15 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- ecore-0.9.9.007/configure.in~fix-configure -+++ ecore-0.9.9.007/configure.in -@@ -15,7 +15,6 @@ - AC_CHECK_SIZEOF(int, 4) - AM_ENABLE_SHARED - AM_PROG_LIBTOOL --AC_C___ATTRIBUTE__ - - if test "x${bindir}" = 'x${exec_prefix}/bin'; then - if test "x${exec_prefix}" = "xNONE"; then diff --git a/packages/efl/files/x.patch b/packages/efl/files/x.patch deleted file mode 100644 index 98c1ec635b..0000000000 --- a/packages/efl/files/x.patch +++ /dev/null @@ -1,1813 +0,0 @@ -Index: imlib2-1.2.0/configure.in -=================================================================== ---- imlib2-1.2.0.orig/configure.in 2005-01-05 04:39:08.000000000 -0500 -+++ imlib2-1.2.0/configure.in 2005-03-12 20:26:02.313852728 -0500 -@@ -139,35 +139,12 @@ - freetype_cflags=`$FREETYPE_CONFIG --cflags` - freetype_libs=`$FREETYPE_CONFIG --libs` - --x11=no --AC_ARG_ENABLE(x11,[ --disable-x11 attempt to build with X11 support [default=yes]], --[ -- if test x$enableval = xyes; then -- have_x=yes -- else -- have_x=no -- fi --], --[ -- AC_CHECK_HEADER(X11/X.h, -- [ have_x="yes" ], -- [ have_x="no" ] -- ) --] --) --AC_MSG_CHECKING(whether X11 support is to be enabled) --if test "x$have_x" = "xyes"; then -- x_dir="/usr/X11R6"; -- x_cflags="-I"$x_dir"/include" -- x_libs="-L"$x_dir"/lib -lX11 -lXext" -- AC_MSG_RESULT(enabling X11 support) -+AC_PATH_XTRA -+if test "x$with_x" = "xyes"; then - AM_CONDITIONAL(BUILD_X11, true) - AC_DEFINE(BUILD_X11, 1, [enabling X11 support]) -+ X_LIBS="$X_LIBS -lX11 -lXext" - else -- x_dir="" -- x_cflags="" -- x_libs="" -- AC_MSG_RESULT(disabling X11 support) - AM_CONDITIONAL(BUILD_X11, false) - fi - -Index: imlib2-1.2.0/src/Makefile.in -=================================================================== ---- imlib2-1.2.0.orig/src/Makefile.in 2004-04-06 13:56:48.000000000 -0400 -+++ imlib2-1.2.0/src/Makefile.in 2005-03-12 20:26:28.578859840 -0500 -@@ -0,0 +1,490 @@ -+# Makefile.in generated by automake 1.9.3 from Makefile.am. -+# @configure_input@ -+ -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004 Free Software Foundation, Inc. -+# This Makefile.in is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -+# PARTICULAR PURPOSE. -+ -+@SET_MAKE@ -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+VPATH = @srcdir@ -+pkgdatadir = $(datadir)/@PACKAGE@ -+pkglibdir = $(libdir)/@PACKAGE@ -+pkgincludedir = $(includedir)/@PACKAGE@ -+top_builddir = .. -+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -+INSTALL = @INSTALL@ -+install_sh_DATA = $(install_sh) -c -m 644 -+install_sh_PROGRAM = $(install_sh) -c -+install_sh_SCRIPT = $(install_sh) -c -+INSTALL_HEADER = $(INSTALL_DATA) -+transform = $(program_transform_name) -+NORMAL_INSTALL = : -+PRE_INSTALL = : -+POST_INSTALL = : -+NORMAL_UNINSTALL = : -+PRE_UNINSTALL = : -+POST_UNINSTALL = : -+build_triplet = @build@ -+host_triplet = @host@ -+target_triplet = @target@ -+subdir = src -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+SOURCES = -+DIST_SOURCES = -+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -+ html-recursive info-recursive install-data-recursive \ -+ install-exec-recursive install-info-recursive \ -+ install-recursive installcheck-recursive installdirs-recursive \ -+ pdf-recursive ps-recursive uninstall-info-recursive \ -+ uninstall-recursive -+ETAGS = etags -+CTAGS = ctags -+DIST_SUBDIRS = $(SUBDIRS) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ACLOCAL = @ACLOCAL@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ -+AMTAR = @AMTAR@ -+AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ -+AWK = @AWK@ -+BUILD_BZ2_LOADER_FALSE = @BUILD_BZ2_LOADER_FALSE@ -+BUILD_BZ2_LOADER_TRUE = @BUILD_BZ2_LOADER_TRUE@ -+BUILD_GIF_LOADER_FALSE = @BUILD_GIF_LOADER_FALSE@ -+BUILD_GIF_LOADER_TRUE = @BUILD_GIF_LOADER_TRUE@ -+BUILD_JPEG_LOADER_FALSE = @BUILD_JPEG_LOADER_FALSE@ -+BUILD_JPEG_LOADER_TRUE = @BUILD_JPEG_LOADER_TRUE@ -+BUILD_MMX_FALSE = @BUILD_MMX_FALSE@ -+BUILD_MMX_TRUE = @BUILD_MMX_TRUE@ -+BUILD_PNG_LOADER_FALSE = @BUILD_PNG_LOADER_FALSE@ -+BUILD_PNG_LOADER_TRUE = @BUILD_PNG_LOADER_TRUE@ -+BUILD_TIFF_LOADER_FALSE = @BUILD_TIFF_LOADER_FALSE@ -+BUILD_TIFF_LOADER_TRUE = @BUILD_TIFF_LOADER_TRUE@ -+BUILD_X11_FALSE = @BUILD_X11_FALSE@ -+BUILD_X11_TRUE = @BUILD_X11_TRUE@ -+BUILD_ZLIB_LOADER_FALSE = @BUILD_ZLIB_LOADER_FALSE@ -+BUILD_ZLIB_LOADER_TRUE = @BUILD_ZLIB_LOADER_TRUE@ -+BZ2LIBS = @BZ2LIBS@ -+CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ -+CXX = @CXX@ -+CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ -+DEPDIR = @DEPDIR@ -+ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ -+FREETYPE_CONFIG = @FREETYPE_CONFIG@ -+GIFLIBS = @GIFLIBS@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+JPEGLIBS = @JPEGLIBS@ -+LDFLAGS = @LDFLAGS@ -+LIBOBJS = @LIBOBJS@ -+LIBS = @LIBS@ -+LIBTOOL = @LIBTOOL@ -+LN_S = @LN_S@ -+LTLIBOBJS = @LTLIBOBJS@ -+MAKEINFO = @MAKEINFO@ -+OBJEXT = @OBJEXT@ -+PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ -+PNGLIBS = @PNGLIBS@ -+RANLIB = @RANLIB@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ -+STRIP = @STRIP@ -+TIFFLIBS = @TIFFLIBS@ -+VERSION = @VERSION@ -+X_CFLAGS = @X_CFLAGS@ -+X_EXTRA_LIBS = @X_EXTRA_LIBS@ -+X_LIBS = @X_LIBS@ -+X_PRE_LIBS = @X_PRE_LIBS@ -+ZLIBLIBS = @ZLIBLIBS@ -+ac_ct_AR = @ac_ct_AR@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ -+ac_ct_RANLIB = @ac_ct_RANLIB@ -+ac_ct_STRIP = @ac_ct_STRIP@ -+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ -+am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ -+datadir = @datadir@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+includedir = @includedir@ -+infodir = @infodir@ -+install_sh = @install_sh@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+mkdir_p = @mkdir_p@ -+my_includes = @my_includes@ -+my_libs = @my_libs@ -+oldincludedir = @oldincludedir@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+sbindir = @sbindir@ -+sharedstatedir = @sharedstatedir@ -+sysconfdir = @sysconfdir@ -+target = @target@ -+target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ -+MAINTAINERCLEANFILES = Makefile.in -+SUBDIRS = lib bin modules -+all: all-recursive -+ -+.SUFFIXES: -+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ -+ cd $(top_srcdir) && \ -+ $(AUTOMAKE) --foreign src/Makefile -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+mostlyclean-libtool: -+ -rm -f *.lo -+ -+clean-libtool: -+ -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+ -+# This directory's subdirectories are mostly independent; you can cd -+# into them and run `make' without going through this Makefile. -+# To change the values of `make' variables: instead of editing Makefiles, -+# (1) if the variable is set in `config.status', edit `config.status' -+# (which will cause the Makefiles to be regenerated when you run `make'); -+# (2) otherwise, pass the desired values on the `make' command line. -+$(RECURSIVE_TARGETS): -+ @set fnord $$MAKEFLAGS; amf=$$2; \ -+ dot_seen=no; \ -+ target=`echo $@ | sed s/-recursive//`; \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ echo "Making $$target in $$subdir"; \ -+ if test "$$subdir" = "."; then \ -+ dot_seen=yes; \ -+ local_target="$$target-am"; \ -+ else \ -+ local_target="$$target"; \ -+ fi; \ -+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ done; \ -+ if test "$$dot_seen" = "no"; then \ -+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ -+ fi; test -z "$$fail" -+ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @set fnord $$MAKEFLAGS; amf=$$2; \ -+ dot_seen=no; \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ rev=''; for subdir in $$list; do \ -+ if test "$$subdir" = "."; then :; else \ -+ rev="$$subdir $$rev"; \ -+ fi; \ -+ done; \ -+ rev="$$rev ."; \ -+ target=`echo $@ | sed s/-recursive//`; \ -+ for subdir in $$rev; do \ -+ echo "Making $$target in $$subdir"; \ -+ if test "$$subdir" = "."; then \ -+ local_target="$$target-am"; \ -+ else \ -+ local_target="$$target"; \ -+ fi; \ -+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ done && test -z "$$fail" -+tags-recursive: -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -+ done -+ctags-recursive: -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -+ done -+ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ mkid -fID $$unique -+tags: TAGS -+ -+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ include_option=--etags-include; \ -+ empty_fix=.; \ -+ else \ -+ include_option=--include; \ -+ empty_fix=; \ -+ fi; \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ if test "$$subdir" = .; then :; else \ -+ test ! -f $$subdir/TAGS || \ -+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ -+ fi; \ -+ done; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi -+ctags: CTAGS -+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$tags $$unique -+ -+GTAGS: -+ here=`$(am__cd) $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $(GTAGS_ARGS) $$here -+ -+distclean-tags: -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+ -+distdir: $(DISTFILES) -+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -+ list='$(DISTFILES)'; for file in $$list; do \ -+ case $$file in \ -+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -+ esac; \ -+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -+ dir="/$$dir"; \ -+ $(mkdir_p) "$(distdir)$$dir"; \ -+ else \ -+ dir=''; \ -+ fi; \ -+ if test -d $$d/$$file; then \ -+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -+ fi; \ -+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ -+ else \ -+ test -f $(distdir)/$$file \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ -+ fi; \ -+ done -+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ if test "$$subdir" = .; then :; else \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(mkdir_p) "$(distdir)/$$subdir" \ -+ || exit 1; \ -+ distdir=`$(am__cd) $(distdir) && pwd`; \ -+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ -+ (cd $$subdir && \ -+ $(MAKE) $(AM_MAKEFLAGS) \ -+ top_distdir="$$top_distdir" \ -+ distdir="$$distdir/$$subdir" \ -+ distdir) \ -+ || exit 1; \ -+ fi; \ -+ done -+check-am: all-am -+check: check-recursive -+all-am: Makefile -+installdirs: installdirs-recursive -+installdirs-am: -+install: install-recursive -+install-exec: install-exec-recursive -+install-data: install-data-recursive -+uninstall: uninstall-recursive -+ -+install-am: all-am -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+ -+installcheck: installcheck-recursive -+install-strip: -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+mostlyclean-generic: -+ -+clean-generic: -+ -+distclean-generic: -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -+maintainer-clean-generic: -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -+clean: clean-recursive -+ -+clean-am: clean-generic clean-libtool mostlyclean-am -+ -+distclean: distclean-recursive -+ -rm -f Makefile -+distclean-am: clean-am distclean-generic distclean-libtool \ -+ distclean-tags -+ -+dvi: dvi-recursive -+ -+dvi-am: -+ -+html: html-recursive -+ -+info: info-recursive -+ -+info-am: -+ -+install-data-am: -+ -+install-exec-am: -+ -+install-info: install-info-recursive -+ -+install-man: -+ -+installcheck-am: -+ -+maintainer-clean: maintainer-clean-recursive -+ -rm -f Makefile -+maintainer-clean-am: distclean-am maintainer-clean-generic -+ -+mostlyclean: mostlyclean-recursive -+ -+mostlyclean-am: mostlyclean-generic mostlyclean-libtool -+ -+pdf: pdf-recursive -+ -+pdf-am: -+ -+ps: ps-recursive -+ -+ps-am: -+ -+uninstall-am: uninstall-info-am -+ -+uninstall-info: uninstall-info-recursive -+ -+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ -+ clean clean-generic clean-libtool clean-recursive ctags \ -+ ctags-recursive distclean distclean-generic distclean-libtool \ -+ distclean-recursive distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-exec install-exec-am install-info \ -+ install-info-am install-man install-strip installcheck \ -+ installcheck-am installdirs installdirs-am maintainer-clean \ -+ maintainer-clean-generic maintainer-clean-recursive \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool \ -+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ -+ uninstall uninstall-am uninstall-info-am -+ -+# Tell versions [3.59,3.63) of GNU make to not export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: -Index: imlib2-1.2.0/src/bin/Makefile.am -=================================================================== ---- imlib2-1.2.0.orig/src/bin/Makefile.am 2004-11-01 04:39:42.000000000 -0500 -+++ imlib2-1.2.0/src/bin/Makefile.am 2005-03-12 20:15:33.099507848 -0500 -@@ -3,6 +3,7 @@ - INCLUDES = \ - -I../lib \ - -I$(top_srcdir)/src/lib \ -+$(X_CFLAGS) \ - @my_includes@ - - if BUILD_X11 -@@ -14,22 +15,22 @@ - $(X_BASED_PROGS) - - imlib2_conv_SOURCES = imlib2_conv.c --imlib2_conv_LDADD = $(top_builddir)/src/lib/libImlib2.la -+imlib2_conv_LDADD = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la - - imlib2_show_SOURCES = imlib2_show.c --imlib2_show_LDADD = $(top_builddir)/src/lib/libImlib2.la -+imlib2_show_LDADD = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la - - imlib2_test_SOURCES = imlib2_test.c --imlib2_test_LDADD = $(top_builddir)/src/lib/libImlib2.la -+imlib2_test_LDADD = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la - - imlib2_bumpmap_SOURCES = imlib2_bumpmap.c --imlib2_bumpmap_LDADD = $(top_builddir)/src/lib/libImlib2.la -+imlib2_bumpmap_LDADD = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la - - imlib2_poly_SOURCES = imlib2_poly.c --imlib2_poly_LDADD = $(top_builddir)/src/lib/libImlib2.la -+imlib2_poly_LDADD = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la - - imlib2_colorspace_SOURCES = imlib2_colorspace.c --imlib2_colorspace_LDADD = $(top_builddir)/src/lib/libImlib2.la -+imlib2_colorspace_LDADD = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la - - imlib2_view_SOURCES = imlib2_view.c --imlib2_view_LDADD = $(top_builddir)/src/lib/libImlib2.la -+imlib2_view_LDADD = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la -Index: imlib2-1.2.0/src/bin/Makefile.in -=================================================================== ---- imlib2-1.2.0.orig/src/bin/Makefile.in 2004-04-06 13:56:48.000000000 -0400 -+++ imlib2-1.2.0/src/bin/Makefile.in 2005-03-12 20:26:28.815823816 -0500 -@@ -0,0 +1,561 @@ -+# Makefile.in generated by automake 1.9.3 from Makefile.am. -+# @configure_input@ -+ -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004 Free Software Foundation, Inc. -+# This Makefile.in is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -+# PARTICULAR PURPOSE. -+ -+@SET_MAKE@ -+ -+SOURCES = $(imlib2_bumpmap_SOURCES) $(imlib2_colorspace_SOURCES) $(imlib2_conv_SOURCES) $(imlib2_poly_SOURCES) $(imlib2_show_SOURCES) $(imlib2_test_SOURCES) $(imlib2_view_SOURCES) -+ -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+VPATH = @srcdir@ -+pkgdatadir = $(datadir)/@PACKAGE@ -+pkglibdir = $(libdir)/@PACKAGE@ -+pkgincludedir = $(includedir)/@PACKAGE@ -+top_builddir = ../.. -+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -+INSTALL = @INSTALL@ -+install_sh_DATA = $(install_sh) -c -m 644 -+install_sh_PROGRAM = $(install_sh) -c -+install_sh_SCRIPT = $(install_sh) -c -+INSTALL_HEADER = $(INSTALL_DATA) -+transform = $(program_transform_name) -+NORMAL_INSTALL = : -+PRE_INSTALL = : -+POST_INSTALL = : -+NORMAL_UNINSTALL = : -+PRE_UNINSTALL = : -+POST_UNINSTALL = : -+build_triplet = @build@ -+host_triplet = @host@ -+target_triplet = @target@ -+bin_PROGRAMS = imlib2_conv$(EXEEXT) $(am__EXEEXT_1) -+subdir = src/bin -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+@BUILD_X11_TRUE@am__EXEEXT_1 = imlib2_show$(EXEEXT) \ -+@BUILD_X11_TRUE@ imlib2_test$(EXEEXT) imlib2_bumpmap$(EXEEXT) \ -+@BUILD_X11_TRUE@ imlib2_poly$(EXEEXT) \ -+@BUILD_X11_TRUE@ imlib2_colorspace$(EXEEXT) \ -+@BUILD_X11_TRUE@ imlib2_view$(EXEEXT) -+am__installdirs = "$(DESTDIR)$(bindir)" -+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -+PROGRAMS = $(bin_PROGRAMS) -+am_imlib2_bumpmap_OBJECTS = imlib2_bumpmap.$(OBJEXT) -+imlib2_bumpmap_OBJECTS = $(am_imlib2_bumpmap_OBJECTS) -+am__DEPENDENCIES_1 = -+imlib2_bumpmap_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ $(top_builddir)/src/lib/libImlib2.la -+am_imlib2_colorspace_OBJECTS = imlib2_colorspace.$(OBJEXT) -+imlib2_colorspace_OBJECTS = $(am_imlib2_colorspace_OBJECTS) -+imlib2_colorspace_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ $(top_builddir)/src/lib/libImlib2.la -+am_imlib2_conv_OBJECTS = imlib2_conv.$(OBJEXT) -+imlib2_conv_OBJECTS = $(am_imlib2_conv_OBJECTS) -+imlib2_conv_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ $(top_builddir)/src/lib/libImlib2.la -+am_imlib2_poly_OBJECTS = imlib2_poly.$(OBJEXT) -+imlib2_poly_OBJECTS = $(am_imlib2_poly_OBJECTS) -+imlib2_poly_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ $(top_builddir)/src/lib/libImlib2.la -+am_imlib2_show_OBJECTS = imlib2_show.$(OBJEXT) -+imlib2_show_OBJECTS = $(am_imlib2_show_OBJECTS) -+imlib2_show_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ $(top_builddir)/src/lib/libImlib2.la -+am_imlib2_test_OBJECTS = imlib2_test.$(OBJEXT) -+imlib2_test_OBJECTS = $(am_imlib2_test_OBJECTS) -+imlib2_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ $(top_builddir)/src/lib/libImlib2.la -+am_imlib2_view_OBJECTS = imlib2_view.$(OBJEXT) -+imlib2_view_OBJECTS = $(am_imlib2_view_OBJECTS) -+imlib2_view_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ $(top_builddir)/src/lib/libImlib2.la -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+SOURCES = $(imlib2_bumpmap_SOURCES) $(imlib2_colorspace_SOURCES) \ -+ $(imlib2_conv_SOURCES) $(imlib2_poly_SOURCES) \ -+ $(imlib2_show_SOURCES) $(imlib2_test_SOURCES) \ -+ $(imlib2_view_SOURCES) -+DIST_SOURCES = $(imlib2_bumpmap_SOURCES) $(imlib2_colorspace_SOURCES) \ -+ $(imlib2_conv_SOURCES) $(imlib2_poly_SOURCES) \ -+ $(imlib2_show_SOURCES) $(imlib2_test_SOURCES) \ -+ $(imlib2_view_SOURCES) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ACLOCAL = @ACLOCAL@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ -+AMTAR = @AMTAR@ -+AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ -+AWK = @AWK@ -+BUILD_BZ2_LOADER_FALSE = @BUILD_BZ2_LOADER_FALSE@ -+BUILD_BZ2_LOADER_TRUE = @BUILD_BZ2_LOADER_TRUE@ -+BUILD_GIF_LOADER_FALSE = @BUILD_GIF_LOADER_FALSE@ -+BUILD_GIF_LOADER_TRUE = @BUILD_GIF_LOADER_TRUE@ -+BUILD_JPEG_LOADER_FALSE = @BUILD_JPEG_LOADER_FALSE@ -+BUILD_JPEG_LOADER_TRUE = @BUILD_JPEG_LOADER_TRUE@ -+BUILD_MMX_FALSE = @BUILD_MMX_FALSE@ -+BUILD_MMX_TRUE = @BUILD_MMX_TRUE@ -+BUILD_PNG_LOADER_FALSE = @BUILD_PNG_LOADER_FALSE@ -+BUILD_PNG_LOADER_TRUE = @BUILD_PNG_LOADER_TRUE@ -+BUILD_TIFF_LOADER_FALSE = @BUILD_TIFF_LOADER_FALSE@ -+BUILD_TIFF_LOADER_TRUE = @BUILD_TIFF_LOADER_TRUE@ -+BUILD_X11_FALSE = @BUILD_X11_FALSE@ -+BUILD_X11_TRUE = @BUILD_X11_TRUE@ -+BUILD_ZLIB_LOADER_FALSE = @BUILD_ZLIB_LOADER_FALSE@ -+BUILD_ZLIB_LOADER_TRUE = @BUILD_ZLIB_LOADER_TRUE@ -+BZ2LIBS = @BZ2LIBS@ -+CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ -+CXX = @CXX@ -+CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ -+DEPDIR = @DEPDIR@ -+ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ -+FREETYPE_CONFIG = @FREETYPE_CONFIG@ -+GIFLIBS = @GIFLIBS@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+JPEGLIBS = @JPEGLIBS@ -+LDFLAGS = @LDFLAGS@ -+LIBOBJS = @LIBOBJS@ -+LIBS = @LIBS@ -+LIBTOOL = @LIBTOOL@ -+LN_S = @LN_S@ -+LTLIBOBJS = @LTLIBOBJS@ -+MAKEINFO = @MAKEINFO@ -+OBJEXT = @OBJEXT@ -+PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ -+PNGLIBS = @PNGLIBS@ -+RANLIB = @RANLIB@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ -+STRIP = @STRIP@ -+TIFFLIBS = @TIFFLIBS@ -+VERSION = @VERSION@ -+X_CFLAGS = @X_CFLAGS@ -+X_EXTRA_LIBS = @X_EXTRA_LIBS@ -+X_LIBS = @X_LIBS@ -+X_PRE_LIBS = @X_PRE_LIBS@ -+ZLIBLIBS = @ZLIBLIBS@ -+ac_ct_AR = @ac_ct_AR@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ -+ac_ct_RANLIB = @ac_ct_RANLIB@ -+ac_ct_STRIP = @ac_ct_STRIP@ -+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ -+am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ -+datadir = @datadir@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+includedir = @includedir@ -+infodir = @infodir@ -+install_sh = @install_sh@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+mkdir_p = @mkdir_p@ -+my_includes = @my_includes@ -+my_libs = @my_libs@ -+oldincludedir = @oldincludedir@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+sbindir = @sbindir@ -+sharedstatedir = @sharedstatedir@ -+sysconfdir = @sysconfdir@ -+target = @target@ -+target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ -+MAINTAINERCLEANFILES = Makefile.in -+INCLUDES = \ -+-I../lib \ -+-I$(top_srcdir)/src/lib \ -+$(X_CFLAGS) \ -+@my_includes@ -+ -+@BUILD_X11_TRUE@X_BASED_PROGS = imlib2_show imlib2_test imlib2_bumpmap imlib2_poly imlib2_colorspace imlib2_view -+imlib2_conv_SOURCES = imlib2_conv.c -+imlib2_conv_LDADD = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la -+imlib2_show_SOURCES = imlib2_show.c -+imlib2_show_LDADD = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la -+imlib2_test_SOURCES = imlib2_test.c -+imlib2_test_LDADD = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la -+imlib2_bumpmap_SOURCES = imlib2_bumpmap.c -+imlib2_bumpmap_LDADD = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la -+imlib2_poly_SOURCES = imlib2_poly.c -+imlib2_poly_LDADD = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la -+imlib2_colorspace_SOURCES = imlib2_colorspace.c -+imlib2_colorspace_LDADD = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la -+imlib2_view_SOURCES = imlib2_view.c -+imlib2_view_LDADD = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la -+all: all-am -+ -+.SUFFIXES: -+.SUFFIXES: .c .lo .o .obj -+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/bin/Makefile'; \ -+ cd $(top_srcdir) && \ -+ $(AUTOMAKE) --foreign src/bin/Makefile -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+install-binPROGRAMS: $(bin_PROGRAMS) -+ @$(NORMAL_INSTALL) -+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" -+ @list='$(bin_PROGRAMS)'; for p in $$list; do \ -+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ -+ if test -f $$p \ -+ || test -f $$p1 \ -+ ; then \ -+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ -+ else :; fi; \ -+ done -+ -+uninstall-binPROGRAMS: -+ @$(NORMAL_UNINSTALL) -+ @list='$(bin_PROGRAMS)'; for p in $$list; do \ -+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ -+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(bindir)/$$f"; \ -+ done -+ -+clean-binPROGRAMS: -+ @list='$(bin_PROGRAMS)'; for p in $$list; do \ -+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ -+ echo " rm -f $$p $$f"; \ -+ rm -f $$p $$f ; \ -+ done -+imlib2_bumpmap$(EXEEXT): $(imlib2_bumpmap_OBJECTS) $(imlib2_bumpmap_DEPENDENCIES) -+ @rm -f imlib2_bumpmap$(EXEEXT) -+ $(LINK) $(imlib2_bumpmap_LDFLAGS) $(imlib2_bumpmap_OBJECTS) $(imlib2_bumpmap_LDADD) $(LIBS) -+imlib2_colorspace$(EXEEXT): $(imlib2_colorspace_OBJECTS) $(imlib2_colorspace_DEPENDENCIES) -+ @rm -f imlib2_colorspace$(EXEEXT) -+ $(LINK) $(imlib2_colorspace_LDFLAGS) $(imlib2_colorspace_OBJECTS) $(imlib2_colorspace_LDADD) $(LIBS) -+imlib2_conv$(EXEEXT): $(imlib2_conv_OBJECTS) $(imlib2_conv_DEPENDENCIES) -+ @rm -f imlib2_conv$(EXEEXT) -+ $(LINK) $(imlib2_conv_LDFLAGS) $(imlib2_conv_OBJECTS) $(imlib2_conv_LDADD) $(LIBS) -+imlib2_poly$(EXEEXT): $(imlib2_poly_OBJECTS) $(imlib2_poly_DEPENDENCIES) -+ @rm -f imlib2_poly$(EXEEXT) -+ $(LINK) $(imlib2_poly_LDFLAGS) $(imlib2_poly_OBJECTS) $(imlib2_poly_LDADD) $(LIBS) -+imlib2_show$(EXEEXT): $(imlib2_show_OBJECTS) $(imlib2_show_DEPENDENCIES) -+ @rm -f imlib2_show$(EXEEXT) -+ $(LINK) $(imlib2_show_LDFLAGS) $(imlib2_show_OBJECTS) $(imlib2_show_LDADD) $(LIBS) -+imlib2_test$(EXEEXT): $(imlib2_test_OBJECTS) $(imlib2_test_DEPENDENCIES) -+ @rm -f imlib2_test$(EXEEXT) -+ $(LINK) $(imlib2_test_LDFLAGS) $(imlib2_test_OBJECTS) $(imlib2_test_LDADD) $(LIBS) -+imlib2_view$(EXEEXT): $(imlib2_view_OBJECTS) $(imlib2_view_DEPENDENCIES) -+ @rm -f imlib2_view$(EXEEXT) -+ $(LINK) $(imlib2_view_LDFLAGS) $(imlib2_view_OBJECTS) $(imlib2_view_LDADD) $(LIBS) -+ -+mostlyclean-compile: -+ -rm -f *.$(OBJEXT) -+ -+distclean-compile: -+ -rm -f *.tab.c -+ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imlib2_bumpmap.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imlib2_colorspace.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imlib2_conv.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imlib2_poly.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imlib2_show.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imlib2_test.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imlib2_view.Po@am__quote@ -+ -+.c.o: -+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< -+ -+.c.obj: -+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -+ -+.c.lo: -+@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -+ -+mostlyclean-libtool: -+ -rm -f *.lo -+ -+clean-libtool: -+ -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ mkid -fID $$unique -+tags: TAGS -+ -+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi -+ctags: CTAGS -+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$tags $$unique -+ -+GTAGS: -+ here=`$(am__cd) $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $(GTAGS_ARGS) $$here -+ -+distclean-tags: -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+ -+distdir: $(DISTFILES) -+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -+ list='$(DISTFILES)'; for file in $$list; do \ -+ case $$file in \ -+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -+ esac; \ -+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -+ dir="/$$dir"; \ -+ $(mkdir_p) "$(distdir)$$dir"; \ -+ else \ -+ dir=''; \ -+ fi; \ -+ if test -d $$d/$$file; then \ -+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -+ fi; \ -+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ -+ else \ -+ test -f $(distdir)/$$file \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ -+ fi; \ -+ done -+check-am: all-am -+check: check-am -+all-am: Makefile $(PROGRAMS) -+installdirs: -+ for dir in "$(DESTDIR)$(bindir)"; do \ -+ test -z "$$dir" || $(mkdir_p) "$$dir"; \ -+ done -+install: install-am -+install-exec: install-exec-am -+install-data: install-data-am -+uninstall: uninstall-am -+ -+install-am: all-am -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+ -+installcheck: installcheck-am -+install-strip: -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+mostlyclean-generic: -+ -+clean-generic: -+ -+distclean-generic: -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -+maintainer-clean-generic: -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -+clean: clean-am -+ -+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am -+ -+distclean: distclean-am -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+distclean-am: clean-am distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags -+ -+dvi: dvi-am -+ -+dvi-am: -+ -+html: html-am -+ -+info: info-am -+ -+info-am: -+ -+install-data-am: -+ -+install-exec-am: install-binPROGRAMS -+ -+install-info: install-info-am -+ -+install-man: -+ -+installcheck-am: -+ -+maintainer-clean: maintainer-clean-am -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+maintainer-clean-am: distclean-am maintainer-clean-generic -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool -+ -+pdf: pdf-am -+ -+pdf-am: -+ -+ps: ps-am -+ -+ps-am: -+ -+uninstall-am: uninstall-binPROGRAMS uninstall-info-am -+ -+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ -+ clean-generic clean-libtool ctags distclean distclean-compile \ -+ distclean-generic distclean-libtool distclean-tags distdir dvi \ -+ dvi-am html html-am info info-am install install-am \ -+ install-binPROGRAMS install-data install-data-am install-exec \ -+ install-exec-am install-info install-info-am install-man \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags uninstall uninstall-am \ -+ uninstall-binPROGRAMS uninstall-info-am -+ -+# Tell versions [3.59,3.63) of GNU make to not export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: -Index: imlib2-1.2.0/src/lib/Makefile.am -=================================================================== ---- imlib2-1.2.0.orig/src/lib/Makefile.am 2004-11-02 01:19:14.000000000 -0500 -+++ imlib2-1.2.0/src/lib/Makefile.am 2005-03-12 20:11:32.783041504 -0500 -@@ -1,6 +1,6 @@ - AUTOMAKE_OPTIONS = 1.4 foreign - MAINTAINERCLEANFILES = Makefile.in --INCLUDES = @my_includes@ -I. -I$(top_srcdir) -I$(top_builddir) -+INCLUDES = $(X_CFLAGS) @my_includes@ -I. -I$(top_srcdir) -I$(top_builddir) - - lib_LTLIBRARIES = libImlib2.la - include_HEADERS = Imlib2.h -@@ -79,10 +79,10 @@ - MMX_OBJS = $(MMX_SRCS:.S=.lo) - - if BUILD_MMX --libImlib2_la_LIBADD = $(MMX_OBJS) @my_libs@ -+libImlib2_la_LIBADD = $(X_LIBS) $(MMX_OBJS) @my_libs@ - libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(MMX_OBJS) - else --libImlib2_la_LIBADD = @my_libs@ -+libImlib2_la_LIBADD = $(X_LIBS) @my_libs@ - libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h - endif - libImlib2_la_LDFLAGS = -version-info 3:0:2 -Index: imlib2-1.2.0/src/lib/Makefile.in -=================================================================== ---- imlib2-1.2.0.orig/src/lib/Makefile.in 2004-04-06 13:56:48.000000000 -0400 -+++ imlib2-1.2.0/src/lib/Makefile.in 2005-03-12 20:26:29.090782016 -0500 -@@ -0,0 +1,637 @@ -+# Makefile.in generated by automake 1.9.3 from Makefile.am. -+# @configure_input@ -+ -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004 Free Software Foundation, Inc. -+# This Makefile.in is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -+# PARTICULAR PURPOSE. -+ -+@SET_MAKE@ -+ -+ -+SOURCES = $(libImlib2_la_SOURCES) $(EXTRA_libImlib2_la_SOURCES) -+ -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+VPATH = @srcdir@ -+pkgdatadir = $(datadir)/@PACKAGE@ -+pkglibdir = $(libdir)/@PACKAGE@ -+pkgincludedir = $(includedir)/@PACKAGE@ -+top_builddir = ../.. -+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -+INSTALL = @INSTALL@ -+install_sh_DATA = $(install_sh) -c -m 644 -+install_sh_PROGRAM = $(install_sh) -c -+install_sh_SCRIPT = $(install_sh) -c -+INSTALL_HEADER = $(INSTALL_DATA) -+transform = $(program_transform_name) -+NORMAL_INSTALL = : -+PRE_INSTALL = : -+POST_INSTALL = : -+NORMAL_UNINSTALL = : -+PRE_UNINSTALL = : -+POST_UNINSTALL = : -+build_triplet = @build@ -+host_triplet = @host@ -+target_triplet = @target@ -+subdir = src/lib -+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" -+libLTLIBRARIES_INSTALL = $(INSTALL) -+LTLIBRARIES = $(lib_LTLIBRARIES) -+am__DEPENDENCIES_1 = -+am__DEPENDENCIES_2 = asm_blend.lo asm_blend_cmod.lo asm_rgba.lo \ -+ asm_rotate.lo asm_scale.lo -+am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) -+am_libImlib2_la_OBJECTS = api.lo blend.lo color.lo color_helpers.lo \ -+ colormod.lo context.lo draw.lo dynamic_filters.lo ellipse.lo \ -+ file.lo filter.lo font_draw.lo font_load.lo font_main.lo \ -+ font_query.lo format.lo grab.lo grad.lo image.lo line.lo \ -+ polygon.lo rectangle.lo rend.lo rgba.lo rgbadraw.lo rotate.lo \ -+ scale.lo script.lo span.lo updates.lo ximage.lo -+libImlib2_la_OBJECTS = $(am_libImlib2_la_OBJECTS) -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS) -+LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \ -+ $(CCASFLAGS) -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+SOURCES = $(libImlib2_la_SOURCES) $(EXTRA_libImlib2_la_SOURCES) -+DIST_SOURCES = $(libImlib2_la_SOURCES) $(EXTRA_libImlib2_la_SOURCES) -+includeHEADERS_INSTALL = $(INSTALL_HEADER) -+HEADERS = $(include_HEADERS) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ACLOCAL = @ACLOCAL@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ -+AMTAR = @AMTAR@ -+AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ -+AWK = @AWK@ -+BUILD_BZ2_LOADER_FALSE = @BUILD_BZ2_LOADER_FALSE@ -+BUILD_BZ2_LOADER_TRUE = @BUILD_BZ2_LOADER_TRUE@ -+BUILD_GIF_LOADER_FALSE = @BUILD_GIF_LOADER_FALSE@ -+BUILD_GIF_LOADER_TRUE = @BUILD_GIF_LOADER_TRUE@ -+BUILD_JPEG_LOADER_FALSE = @BUILD_JPEG_LOADER_FALSE@ -+BUILD_JPEG_LOADER_TRUE = @BUILD_JPEG_LOADER_TRUE@ -+BUILD_MMX_FALSE = @BUILD_MMX_FALSE@ -+BUILD_MMX_TRUE = @BUILD_MMX_TRUE@ -+BUILD_PNG_LOADER_FALSE = @BUILD_PNG_LOADER_FALSE@ -+BUILD_PNG_LOADER_TRUE = @BUILD_PNG_LOADER_TRUE@ -+BUILD_TIFF_LOADER_FALSE = @BUILD_TIFF_LOADER_FALSE@ -+BUILD_TIFF_LOADER_TRUE = @BUILD_TIFF_LOADER_TRUE@ -+BUILD_X11_FALSE = @BUILD_X11_FALSE@ -+BUILD_X11_TRUE = @BUILD_X11_TRUE@ -+BUILD_ZLIB_LOADER_FALSE = @BUILD_ZLIB_LOADER_FALSE@ -+BUILD_ZLIB_LOADER_TRUE = @BUILD_ZLIB_LOADER_TRUE@ -+BZ2LIBS = @BZ2LIBS@ -+CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ -+CXX = @CXX@ -+CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ -+DEPDIR = @DEPDIR@ -+ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ -+FREETYPE_CONFIG = @FREETYPE_CONFIG@ -+GIFLIBS = @GIFLIBS@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+JPEGLIBS = @JPEGLIBS@ -+LDFLAGS = @LDFLAGS@ -+LIBOBJS = @LIBOBJS@ -+LIBS = @LIBS@ -+LIBTOOL = @LIBTOOL@ -+LN_S = @LN_S@ -+LTLIBOBJS = @LTLIBOBJS@ -+MAKEINFO = @MAKEINFO@ -+OBJEXT = @OBJEXT@ -+PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ -+PNGLIBS = @PNGLIBS@ -+RANLIB = @RANLIB@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ -+STRIP = @STRIP@ -+TIFFLIBS = @TIFFLIBS@ -+VERSION = @VERSION@ -+X_CFLAGS = @X_CFLAGS@ -+X_EXTRA_LIBS = @X_EXTRA_LIBS@ -+X_LIBS = @X_LIBS@ -+X_PRE_LIBS = @X_PRE_LIBS@ -+ZLIBLIBS = @ZLIBLIBS@ -+ac_ct_AR = @ac_ct_AR@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ -+ac_ct_RANLIB = @ac_ct_RANLIB@ -+ac_ct_STRIP = @ac_ct_STRIP@ -+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ -+am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ -+datadir = @datadir@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+includedir = @includedir@ -+infodir = @infodir@ -+install_sh = @install_sh@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+mkdir_p = @mkdir_p@ -+my_includes = @my_includes@ -+my_libs = @my_libs@ -+oldincludedir = @oldincludedir@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+sbindir = @sbindir@ -+sharedstatedir = @sharedstatedir@ -+sysconfdir = @sysconfdir@ -+target = @target@ -+target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ -+AUTOMAKE_OPTIONS = 1.4 foreign -+MAINTAINERCLEANFILES = Makefile.in -+INCLUDES = $(X_CFLAGS) @my_includes@ -I. -I$(top_srcdir) -I$(top_builddir) -+lib_LTLIBRARIES = libImlib2.la -+include_HEADERS = Imlib2.h -+libImlib2_la_SOURCES = \ -+api.c \ -+blend.c \ -+blend.h \ -+color.c \ -+color.h \ -+color_helpers.c \ -+color_helpers.h \ -+colormod.c \ -+colormod.h \ -+common.h \ -+context.c \ -+context.h \ -+draw.c \ -+draw.h \ -+dynamic_filters.c \ -+dynamic_filters.h \ -+ellipse.c \ -+file.c \ -+file.h \ -+filter.c \ -+filter.h \ -+font.h \ -+font_draw.c \ -+font_load.c \ -+font_main.c \ -+font_query.c \ -+format.c \ -+format.h \ -+grab.c \ -+grab.h \ -+grad.c \ -+grad.h \ -+image.c \ -+image.h \ -+line.c \ -+loaderpath.h \ -+polygon.c \ -+rectangle.c \ -+rend.c \ -+rend.h \ -+rgba.c \ -+rgba.h \ -+rgbadraw.c \ -+rgbadraw.h \ -+rotate.c \ -+rotate.h \ -+scale.c \ -+scale.h \ -+script.c \ -+script.h \ -+span.c \ -+span.h \ -+updates.c \ -+updates.h \ -+ximage.c \ -+ximage.h -+ -+AS = $(CC) -+CCAS = $(CC) -+ASFLAGS = -I$(top_srcdir) -I$(top_builddir) -+CCASFLAGS = -I$(top_srcdir) -I$(top_builddir) -+MMX_SRCS = \ -+asm_blend.S \ -+asm_blend_cmod.S \ -+asm_rgba.S \ -+asm_rotate.S \ -+asm_scale.S -+ -+EXTRA_libImlib2_la_SOURCES = $(MMX_SRCS) -+MMX_OBJS = $(MMX_SRCS:.S=.lo) -+@BUILD_MMX_FALSE@libImlib2_la_LIBADD = $(X_LIBS) @my_libs@ -+@BUILD_MMX_TRUE@libImlib2_la_LIBADD = $(X_LIBS) $(MMX_OBJS) @my_libs@ -+@BUILD_MMX_FALSE@libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h -+@BUILD_MMX_TRUE@libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(MMX_OBJS) -+libImlib2_la_LDFLAGS = -version-info 3:0:2 -+all: all-am -+ -+.SUFFIXES: -+.SUFFIXES: .S .c .lo .o .obj -+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/lib/Makefile'; \ -+ cd $(top_srcdir) && \ -+ $(AUTOMAKE) --foreign src/lib/Makefile -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+install-libLTLIBRARIES: $(lib_LTLIBRARIES) -+ @$(NORMAL_INSTALL) -+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" -+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -+ if test -f $$p; then \ -+ f=$(am__strip_dir) \ -+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ -+ else :; fi; \ -+ done -+ -+uninstall-libLTLIBRARIES: -+ @$(NORMAL_UNINSTALL) -+ @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -+ p=$(am__strip_dir) \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ -+ done -+ -+clean-libLTLIBRARIES: -+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) -+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -+ test "$$dir" != "$$p" || dir=.; \ -+ echo "rm -f \"$${dir}/so_locations\""; \ -+ rm -f "$${dir}/so_locations"; \ -+ done -+libImlib2.la: $(libImlib2_la_OBJECTS) $(libImlib2_la_DEPENDENCIES) -+ $(LINK) -rpath $(libdir) $(libImlib2_la_LDFLAGS) $(libImlib2_la_OBJECTS) $(libImlib2_la_LIBADD) $(LIBS) -+ -+mostlyclean-compile: -+ -rm -f *.$(OBJEXT) -+ -+distclean-compile: -+ -rm -f *.tab.c -+ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/api.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blend.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color_helpers.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/colormod.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/context.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/draw.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dynamic_filters.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ellipse.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/font_draw.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/font_load.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/font_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/font_query.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/format.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grab.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grad.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/line.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/polygon.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rectangle.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rend.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgba.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgbadraw.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rotate.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scale.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/script.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/span.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/updates.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ximage.Plo@am__quote@ -+ -+.S.o: -+ $(CCASCOMPILE) -c $< -+ -+.S.obj: -+ $(CCASCOMPILE) -c `$(CYGPATH_W) '$<'` -+ -+.S.lo: -+ $(LTCCASCOMPILE) -c -o $@ $< -+ -+.c.o: -+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< -+ -+.c.obj: -+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -+ -+.c.lo: -+@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -+ -+mostlyclean-libtool: -+ -rm -f *.lo -+ -+clean-libtool: -+ -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+install-includeHEADERS: $(include_HEADERS) -+ @$(NORMAL_INSTALL) -+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)" -+ @list='$(include_HEADERS)'; for p in $$list; do \ -+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -+ f=$(am__strip_dir) \ -+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ -+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ -+ done -+ -+uninstall-includeHEADERS: -+ @$(NORMAL_UNINSTALL) -+ @list='$(include_HEADERS)'; for p in $$list; do \ -+ f=$(am__strip_dir) \ -+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(includedir)/$$f"; \ -+ done -+ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ mkid -fID $$unique -+tags: TAGS -+ -+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi -+ctags: CTAGS -+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$tags $$unique -+ -+GTAGS: -+ here=`$(am__cd) $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $(GTAGS_ARGS) $$here -+ -+distclean-tags: -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+ -+distdir: $(DISTFILES) -+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -+ list='$(DISTFILES)'; for file in $$list; do \ -+ case $$file in \ -+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -+ esac; \ -+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -+ dir="/$$dir"; \ -+ $(mkdir_p) "$(distdir)$$dir"; \ -+ else \ -+ dir=''; \ -+ fi; \ -+ if test -d $$d/$$file; then \ -+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -+ fi; \ -+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ -+ else \ -+ test -f $(distdir)/$$file \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ -+ fi; \ -+ done -+check-am: all-am -+check: check-am -+all-am: Makefile $(LTLIBRARIES) $(HEADERS) -+installdirs: -+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \ -+ test -z "$$dir" || $(mkdir_p) "$$dir"; \ -+ done -+install: install-am -+install-exec: install-exec-am -+install-data: install-data-am -+uninstall: uninstall-am -+ -+install-am: all-am -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+ -+installcheck: installcheck-am -+install-strip: -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+mostlyclean-generic: -+ -+clean-generic: -+ -+distclean-generic: -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -+maintainer-clean-generic: -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -+clean: clean-am -+ -+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ -+ mostlyclean-am -+ -+distclean: distclean-am -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+distclean-am: clean-am distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags -+ -+dvi: dvi-am -+ -+dvi-am: -+ -+html: html-am -+ -+info: info-am -+ -+info-am: -+ -+install-data-am: install-includeHEADERS -+ -+install-exec-am: install-libLTLIBRARIES -+ -+install-info: install-info-am -+ -+install-man: -+ -+installcheck-am: -+ -+maintainer-clean: maintainer-clean-am -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+maintainer-clean-am: distclean-am maintainer-clean-generic -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool -+ -+pdf: pdf-am -+ -+pdf-am: -+ -+ps: ps-am -+ -+ps-am: -+ -+uninstall-am: uninstall-includeHEADERS uninstall-info-am \ -+ uninstall-libLTLIBRARIES -+ -+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -+ clean-libLTLIBRARIES clean-libtool ctags distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-exec \ -+ install-exec-am install-includeHEADERS install-info \ -+ install-info-am install-libLTLIBRARIES install-man \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags uninstall uninstall-am \ -+ uninstall-includeHEADERS uninstall-info-am \ -+ uninstall-libLTLIBRARIES -+ -+# Tell versions [3.59,3.63) of GNU make to not export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: diff --git a/packages/efl/imlib2-fb_1.2.1.004.bb b/packages/efl/imlib2-fb_1.2.1.004.bb index 09fecdaf8b..fdf9b17afc 100644 --- a/packages/efl/imlib2-fb_1.2.1.004.bb +++ b/packages/efl/imlib2-fb_1.2.1.004.bb @@ -1,4 +1,5 @@ include imlib2.inc +PROVIDES += "virtual/imlib2" EXTRA_OECONF = "--without-x \ --disable-mmx" diff --git a/packages/efl/imlib2-native_1.2.1.004.bb b/packages/efl/imlib2-native_1.2.1.004.bb index 4b4c956102..e3a46c4aba 100644 --- a/packages/efl/imlib2-native_1.2.1.004.bb +++ b/packages/efl/imlib2-native_1.2.1.004.bb @@ -2,7 +2,5 @@ include imlib2.inc inherit native DEPENDS = "freetype-native libpng-native jpeg-native" -export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config-native" - EXTRA_OECONF = "--disable-mmx \ --without-x" diff --git a/packages/efl/imlib2-x11_1.2.1.004.bb b/packages/efl/imlib2-x11_1.2.1.004.bb index ca74281ca2..383473e589 100644 --- a/packages/efl/imlib2-x11_1.2.1.004.bb +++ b/packages/efl/imlib2-x11_1.2.1.004.bb @@ -1,8 +1,7 @@ include imlib2.inc +PROVIDES += "virtual/imlib2" DEPENDS += "x11 xext" -export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config" - EXTRA_OECONF = "--disable-mmx \ --with-x \ --x-includes=${STAGING_INCDIR} \ diff --git a/packages/efl/imlib2.inc b/packages/efl/imlib2.inc index 2aa53b96a0..b4a2f267fc 100644 --- a/packages/efl/imlib2.inc +++ b/packages/efl/imlib2.inc @@ -1,6 +1,5 @@ DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipulation." LICENSE = "BSD" -PROVIDES = "virtual/imlib2" DEPENDS = "freetype libpng jpeg" inherit efl diff --git a/packages/meta/e-image.bb b/packages/meta/e-image.bb index fe425050c0..883be10f6b 100644 --- a/packages/meta/e-image.bb +++ b/packages/meta/e-image.bb @@ -1,6 +1,6 @@ export IMAGE_BASENAME = "e-image" -DEPENDS = "task-bootstrap meta-e" +DEPENDS = "task-bootstrap meta-e-x11" export IPKG_INSTALL = "task-bootstrap e-base" diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb index 132c12e8fb..0b3a62cf56 100644 --- a/packages/meta/meta-e-x11.bb +++ b/packages/meta/meta-e-x11.bb @@ -1,18 +1,16 @@ -DESCRIPTION = "Meta-package for Enlightenment X11 Without FrameBuffer" -MAINTAINER = "That Crazy fool emte <emte@labotomy.net>" +DESCRIPTION = "Meta-package for Enlightenment/X11" PACKAGES = "e e-libs e-base" FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \ e##http://openzaurus.org/official/unstable/3.5.2/feed/e" ALLOW_EMPTY = 1 +RDEPENDS_e = "e-libs e-base" -# task-e-libs = "virtual/libiconv imlib2 edb eet evas ecore epeg epsilon embryo edje esmart emotion etox ewl" -# epsilon is currently broke for cross compiling without a patch, raster is looking at it +task-e-libs = "virtual/libiconv imlib2-x11 edb eet evas-x11 ecore-x11 \ + epeg embryo epsylon edje esmart emotion etox ewl" -task-e-libs = "virtual/libiconv imlib2 edb eet evas ecore epeg embryo edje esmart emotion etox ewl" - -task-e-base = "" +task-e-base = "entrance e17 e-iconbar e-utils" RDEPENDS_e-libs = "${task-e-libs}" DEPENDS += "${task-e-libs}" |