From 9853e8a6a36b2dfd64619f4aebd60b93205243b4 Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Thu, 25 Oct 2012 22:07:32 +0000
Subject: [PATCH] Embryo: simplify autotools on Windows

SVN revision: 78496
---
 legacy/embryo/configure.ac        | 11 -----------
 legacy/embryo/src/bin/Makefile.am |  1 -
 legacy/embryo/src/lib/Makefile.am |  6 +++---
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/legacy/embryo/configure.ac b/legacy/embryo/configure.ac
index a918f3e1f0..bfb5a198c4 100644
--- a/legacy/embryo/configure.ac
+++ b/legacy/embryo/configure.ac
@@ -95,16 +95,13 @@ AC_SUBST(pkgconfig_requires_private)
 
 # Evil library for compilation on Windows
 
-EFL_EMBRYO_BUILD=""
 case "$host_os" in
    mingw*)
    PKG_CHECK_MODULES([EVIL], [evil >= 1.6.99])
    AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if Evil library is installed])
    requirement_embryo="evil ${requirement_embryo}"
-   EFL_EMBRYO_BUILD="-DEFL_EMBRYO_BUILD"
    ;;
 esac
-AC_SUBST(EFL_EMBRYO_BUILD)
 
 # For embryo_cc_prefix.c
 PKG_CHECK_MODULES([EINA], [eina >= 1.6.99])
@@ -156,14 +153,6 @@ AC_SUBST(EMBRYO_CFLAGS)
 
 ### Checks for linker characteristics
 
-lt_enable_auto_import=""
-case "$host_os" in
-   mingw*)
-      lt_enable_auto_import="-Wl,--enable-auto-import"
-      ;;
-esac
-AC_SUBST(lt_enable_auto_import)
-
 
 ### Checks for library functions
 
diff --git a/legacy/embryo/src/bin/Makefile.am b/legacy/embryo/src/bin/Makefile.am
index 09f6ffd23b..c180791549 100644
--- a/legacy/embryo/src/bin/Makefile.am
+++ b/legacy/embryo/src/bin/Makefile.am
@@ -33,7 +33,6 @@ embryo_cc_prefix.h
 
 embryo_cc_CFLAGS = @EMBRYO_CFLAGS@
 embryo_cc_LDADD = $(top_builddir)/src/lib/libembryo.la @EVIL_LIBS@ @EINA_LIBS@ -lm
-embryo_cc_LDFLAGS = @lt_enable_auto_import@
 
 EXTRA_DIST = \
 embryo_cc_sc5.scp \
diff --git a/legacy/embryo/src/lib/Makefile.am b/legacy/embryo/src/lib/Makefile.am
index d2ccb5585b..47653e1a2a 100644
--- a/legacy/embryo/src/lib/Makefile.am
+++ b/legacy/embryo/src/lib/Makefile.am
@@ -10,10 +10,10 @@ AM_CPPFLAGS = \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+-DEFL_EMBRYO_BUILD \
 @EVIL_CFLAGS@ \
 @EXOTIC_CFLAGS@ \
-@EMBRYO_CPPFLAGS@ \
-@EFL_EMBRYO_BUILD@
+@EMBRYO_CPPFLAGS@
 
 includes_HEADERS = Embryo.h
 includesdir = $(includedir)/embryo-@VMAJ@
@@ -31,6 +31,6 @@ embryo_time.c
 
 libembryo_la_CFLAGS = @EMBRYO_CFLAGS@
 libembryo_la_LIBADD = @EXOTIC_LIBS@ @EVIL_LIBS@ -lm
-libembryo_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
+libembryo_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
 
 EXTRA_DIST = embryo_private.h