kwo pushed a commit to branch master. http://git.enlightenment.org/legacy/imlib2_loaders.git/commit/?id=d2c54da20b8c0ed3354f708376f4c65b0bac6778
commit d2c54da20b8c0ed3354f708376f4c65b0bac6778 Author: Kim Woelders <k...@woelders.dk> Date: Sat Apr 4 23:26:21 2015 +0200 Autofoo cleanups. - Eliminate my_includes. - Change imlib2 detection to pkg-config and disable because noting here currently uses imlib2. - Remove unnecessary EET_... stuff. - In Makefile.am - add ACLOCAL_AMFLAGS = -I m4. - Clean up MAINTAINERCLEANFILES. - Clean up .gitignore. --- .gitignore | 45 +++++++++++++++++++++-------------------- Makefile.am | 13 ++++++------ configure.ac | 17 ++-------------- src/modules/loaders/Makefile.am | 7 +------ 4 files changed, 33 insertions(+), 49 deletions(-) diff --git a/.gitignore b/.gitignore index 6a9a17b..3394cb3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,30 +1,31 @@ -.svn +/aclocal.m4 +/autom4te.cache +/compile +/config.guess +/config.h +/config.h.in +/config.log +/config.status +/config.sub +/configure +/depcomp +/install-sh +/libtool +/ltmain.sh +/missing +/stamp-h1 +/m4/*.m4 + +/imlib2_loaders.spec +/README + Makefile Makefile.in -aclocal.m4 -autom4te.cache -compile -config.guess -config.h -config.h.in -config.log -config.status -config.sub -configure -depcomp -install-sh -libtool -ltmain.sh -missing -stamp-h1 .deps .libs *.o *.lo *.la -imlib2_loaders.spec -README - -imlib2_loaders-*.tar.bz2 -imlib2_loaders-*.tar.gz +/imlib2_loaders-*.tar.bz2 +/imlib2_loaders-*.tar.gz diff --git a/Makefile.am b/Makefile.am index 3f7c382..8d3e7c9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,14 @@ AUTOMAKE_OPTIONS = foreign +ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = src -MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \ - config.h.in config.sub configure install-sh \ - ltconfig ltmain.sh missing mkinstalldirs \ - stamp-h.in build-stamp configure-stamp depcomp \ - README \ - imlib2_loaders.spec +MAINTAINERCLEANFILES = Makefile.in aclocal.m4 compile \ + config.guess config.h.in config.sub \ + configure depcomp install-sh \ + ltmain.sh missing \ + m4/*.m4 EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN COPYING.loader_xcf imlib2_loaders.spec imlib2_loaders.spec.in \ README.in README diff --git a/configure.ac b/configure.ac index cf41bf6..1e2faec 100644 --- a/configure.ac +++ b/configure.ac @@ -14,6 +14,7 @@ AC_PROG_CC AC_HEADER_STDC AC_C_CONST LT_INIT +PKG_PROG_PKG_CONFIG if test "x${bindir}" = 'x${exec_prefix}/bin'; then if test "x${exec_prefix}" = "xNONE"; then @@ -101,15 +102,7 @@ AC_ARG_ENABLE(xcf, ]) -AC_ARG_WITH(imlib2-config, [ --with-imlib2-config=IMLIB2_CONFIG use imlib2-config specified ], -[ IMLIB2_CONFIG=$withval; - echo "using "$IMLIB2_CONFIG" for imlib2-config"; ], -[ if test -z "$IMLIB2_CONFIG"; then - AC_PATH_PROG(IMLIB2_CONFIG, "imlib2-config", "", $PATH) - fi -]) -my_includes=`$IMLIB2_CONFIG --cflags` - +dnl PKG_CHECK_MODULES(IMLIB2, imlib2) found_eet=no if test "x$eet" != "xno" ; then @@ -119,14 +112,8 @@ if test "x$eet$found_eet" = "xyesno" ; then AC_MSG_ERROR(Eet support was requested but not found) elif test "x$found_eet" = "xno" ; then eet=no - EET_CFLAGS="" - EET_LIBS="" fi -AC_SUBST(my_includes) -AC_SUBST(EET_CFLAGS) -AC_SUBST(EET_LIBS) - AM_CONDITIONAL(BUILD_EET_LOADER, test x$eet != xno) AM_CONDITIONAL(BUILD_XCF_LOADER, test x$xcf != xno) diff --git a/src/modules/loaders/Makefile.am b/src/modules/loaders/Makefile.am index bc2c7e5..7e5b117 100644 --- a/src/modules/loaders/Makefile.am +++ b/src/modules/loaders/Makefile.am @@ -1,10 +1,5 @@ MAINTAINERCLEANFILES = Makefile.in -AM_CPPFLAGS = -I. \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src/modules/loaders \ - @my_includes@ - pkgdir = $(libdir)/imlib2/loaders if BUILD_EET_LOADER @@ -21,7 +16,7 @@ ico.la \ ani.la eet_la_SOURCES = loader_eet.c common.h image.h -eet_la_CPPFLAGS = @EET_CFLAGS@ $(AM_CPPFLAGS) +eet_la_CPPFLAGS = @EET_CFLAGS@ eet_la_LDFLAGS = -module -avoid-version eet_la_LIBADD = @EET_LIBS@ eet_la_LIBTOOLFLAGS = --tag=disable-static --