From 90a58ac7839697dc6beb58aef0ab520ad2ffc069 Mon Sep 17 00:00:00 2001
From: Boris Faure <billiob@gmail.com>
Date: Thu, 29 Sep 2011 20:18:58 +0000
Subject: [PATCH] eenvader: some more autofoo cleanup thx to vtorri

SVN revision: 63673
---
 .gitignore      | 32 ++++++++++++++++++++++++++++++++
 configure.ac    |  8 ++++----
 src/Makefile.am |  6 +++---
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 411d49a..9e7fcd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,35 @@
 /data/Makefile.in
 /data/eenvaders.edj
 /intl
+/ABOUT-NLS
+/config.rpath
+/m4/codeset.m4
+/m4/gettext.m4
+/m4/glibc2.m4
+/m4/glibc21.m4
+/m4/iconv.m4
+/m4/intdiv0.m4
+/m4/intl.m4
+/m4/intldir.m4
+/m4/intlmacosx.m4
+/m4/intmax.m4
+/m4/inttypes-pri.m4
+/m4/inttypes_h.m4
+/m4/lcmessage.m4
+/m4/lib-ld.m4
+/m4/lib-link.m4
+/m4/lib-prefix.m4
+/m4/lock.m4
+/m4/longlong.m4
+/m4/nls.m4
+/m4/po.m4
+/m4/printf-posix.m4
+/m4/progtest.m4
+/m4/size_max.m4
+/m4/stdint_h.m4
+/m4/uintmax_t.m4
+/m4/visibility.m4
+/m4/wchar_t.m4
+/m4/wint_t.m4
+/m4/xsize.m4
+/po/
diff --git a/configure.ac b/configure.ac
index d7c11bf..9359dc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,15 +24,15 @@ define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
 AC_PROG_LIBTOOL
 
 m4_ifdef([AM_GNU_GETTEXT_VERSION], [
-AM_GNU_GETTEXT_VERSION([0.14])
+AM_GNU_GETTEXT_VERSION([0.17])
 ])
 
 PKG_PROG_PKG_CONFIG
-PKG_CHECK_MODULES([EENVADER], [ecore-evas ecore evas eina])
-datadir_edj=$(pkg-config --variable=prefix enlightenment)/share/enlightenment/data/backgrounds
+PKG_CHECK_MODULES([EENVADER], [edje ecore-evas ecore evas eina])
+datadir_edj=$($PKG_CONFIG --variable=prefix enlightenment)/share/enlightenment/data/backgrounds
 
 EFL_WITH_BIN([edje], [edje-cc], [edje_cc])
-vmaj=$(pkg-config --variable=vmaj edje)
+vmaj=$($PKG_CONFIG --variable=vmaj edje)
 MODULE_ARCH="$host_os-$host_cpu-$vmaj.0.0"
 AC_SUBST(MODULE_ARCH)
 AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
diff --git a/src/Makefile.am b/src/Makefile.am
index d44ede3..477406d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = -I. \
 	   -I$(top_srcdir) \
 	   -I$(includedir) \
-	   @EDJE_CFLAGS@
+	   @EENVADER_CFLAGS@
 
 
 pkgdir = $(datadir)/$(MODULE_ARCH)
@@ -11,7 +11,7 @@ module_la_SOURCES = \
 	eenvaders_evas_smart.c \
 	eenvaders_edje_external.c
 
-module_la_LIBADD = @EDJE_LIBS@
+module_la_LIBADD = @EENVADER_LIBS@
 module_la_LDFLAGS = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
 
@@ -21,7 +21,7 @@ eenvaders_SOURCES = \
 	eenvaders_evas_smart.c \
 	eenvaders.c
 eenvaders_CPPFLAGS = \
-	@EENVADER_CFLAGS@
+       @EENVADER_CFLAGS@
 eenvaders_LDADD = \
 	@EENVADER_LIBS@