From f936cbea251d305188ed07a3494f7f8ccaeca678 Mon Sep 17 00:00:00 2001
From: doursse <doursse>
Date: Sun, 4 Nov 2007 09:53:29 +0000
Subject: [PATCH]  * add mail in AC_INIT  * remove Makefile.in when cleaning  *
 INCLUDES -> AM_CPPFLAGS  * minor cleaning

SVN revision: 32342
---
 legacy/edje/Makefile.am              |  2 +-
 legacy/edje/configure.in             | 23 ++++++++++++++++++++++-
 legacy/edje/data/Makefile.am         |  3 +++
 legacy/edje/data/include/Makefile.am |  3 +++
 legacy/edje/src/bin/Makefile.am      |  9 +++++----
 legacy/edje/src/lib/Makefile.am      | 17 ++++++++---------
 6 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/legacy/edje/Makefile.am b/legacy/edje/Makefile.am
index 498428bdf4..5dec5c29a3 100644
--- a/legacy/edje/Makefile.am
+++ b/legacy/edje/Makefile.am
@@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
                        config.h.in config.sub configure install-sh \
 		       ltconfig ltmain.sh missing mkinstalldirs \
 		       stamp-h.in edje_docs.tar edje_docs.tar.gz edje.c \
-		       debian/changelog edje.spec
+		       debian/changelog edje.spec depcomp compile
 
 ### this is all fine and great - but edje should not be going and installing
 ### data in another software's data dir - it's just wrong. not to mention this
diff --git a/legacy/edje/configure.in b/legacy/edje/configure.in
index e8f3ab0b25..b6b286c984 100644
--- a/legacy/edje/configure.in
+++ b/legacy/edje/configure.in
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 # get rid of that stupid cache mechanism
 rm -f config.cache
 
-AC_INIT(edje, 0.5.0.041)
+AC_INIT(edje, 0.5.0.041, enlightenment-devel@lists.sourceforge.net)
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(configure.in)
 AC_CANONICAL_BUILD
@@ -18,6 +18,7 @@ AM_PROG_CC_STDC
 AM_PROG_CC_C_O
 AC_HEADER_STDC
 AC_C_CONST
+
 AC_LIBTOOL_WIN32_DLL
 define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
 define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
@@ -147,3 +148,23 @@ src/lib/Makefile
 src/bin/Makefile
 debian/changelog
 ])
+
+
+#####################################################################
+## Info
+
+echo
+echo
+echo
+echo "------------------------------------------------------------------------"
+echo "$PACKAGE $VERSION"
+echo "------------------------------------------------------------------------"
+echo
+echo "Configuration Options Summary:"
+echo
+echo "  Compilation..........: make"
+echo
+echo "  Installation.........: make install"
+echo
+echo "    prefix.............: $prefix"
+echo
diff --git a/legacy/edje/data/Makefile.am b/legacy/edje/data/Makefile.am
index a5c34af967..1685ff326c 100644
--- a/legacy/edje/data/Makefile.am
+++ b/legacy/edje/data/Makefile.am
@@ -1,3 +1,6 @@
+
+MAINTAINERCLEANFILES = Makefile.in
+
 SUBDIRS = include
 
 EXTRA_DIST = edc.vim
diff --git a/legacy/edje/data/include/Makefile.am b/legacy/edje/data/include/Makefile.am
index 75e517c15c..478813c7df 100644
--- a/legacy/edje/data/include/Makefile.am
+++ b/legacy/edje/data/include/Makefile.am
@@ -1,3 +1,6 @@
+
+MAINTAINERCLEANFILES = Makefile.in
+
 FILES = edje.inc
 
 incdir = $(pkgdatadir)/include
diff --git a/legacy/edje/src/bin/Makefile.am b/legacy/edje/src/bin/Makefile.am
index ac283e05da..8b98c2b17a 100644
--- a/legacy/edje/src/bin/Makefile.am
+++ b/legacy/edje/src/bin/Makefile.am
@@ -1,13 +1,14 @@
-## Process this file with automake to produce Makefile.in
 
-INCLUDES = \
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
 -I$(top_srcdir) \
 -I$(top_srcdir)/bin \
 -I$(top_srcdir)/src/lib \
-@EDJE_CFLAGS@ \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\"
+-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+@EDJE_CFLAGS@
 
 bin_SCRIPTS = \
 @EDJE_RECC_PRG@
diff --git a/legacy/edje/src/lib/Makefile.am b/legacy/edje/src/lib/Makefile.am
index e63be70203..c069ebe299 100644
--- a/legacy/edje/src/lib/Makefile.am
+++ b/legacy/edje/src/lib/Makefile.am
@@ -1,20 +1,20 @@
-## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS     = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 
-INCLUDES	     = \
+AM_CPPFLAGS = \
+-I. \
 -I$(top_srcdir) \
--I$(top_builddir) \
+-I$(top_srcdir)/src/lib \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
 @EDJE_CFLAGS@
 
 lib_LTLIBRARIES      = \
-libedje.la 
+libedje.la
 
 include_HEADERS      =  \
-Edje.h 
+Edje.h
 
 libedje_la_SOURCES  = \
 edje_calc.c \
@@ -37,7 +37,6 @@ edje_cache.c \
 edje_textblock_styles.c
 
 libedje_la_LIBADD       = -lm @EDJE_LIBS@ @fnmatch_libs@
-libedje_la_CPPFLAGS     =
 libedje_la_DEPENDENCIES = $(top_builddir)/config.h
 libedje_la_LDFLAGS      = @create_shared_lib@ -version-info @version_info@