[Pkg-e-commits] [SCM] Enlightenment DR17 graphical layout and animation library branch, upstream-vcs, updated. 00a54b97536aa9ded13ec8505d14a50a99338b40

[doursse]

The following commit has been merged in the upstream-vcs branch:
commit 80bd8da3defaed4dcd0371712e61aba23431102f
Author: doursse <doursse>
Date:   Sat May 31 06:10:58 2008 +0000

    fix autotools stuff for Windows

diff --git a/configure.in b/configure.in
index a559ced..97b6299 100644
--- a/configure.in
+++ b/configure.in
@@ -33,16 +33,25 @@ AC_SUBST(version_info)
 
 AC_FUNC_ALLOCA
 
-create_shared_lib=""
+WIN32_CFLAGS=""
+lt_no_undefined=""
+lt_enable_auto_import=""
 edje_decc_lib=""
 case "$host_os" in
-	mingw|mingw32)
-		create_shared_lib="-no-undefined "
+	mingw*|cegcc)
+		dnl needed for correct definition of EAPI
+		AC_DEFINE(EFL_EDJE_BUILD, 1, [Define to mention that embryo is built])
+		if test "x$host_os" = "xcegcc" ; then
+			WIN32_CFLAGS="-mwin32"
+			lt_enable_auto_import="-Wl,--enable-auto-import"
+		fi
+		lt_no_undefined="-no-undefined"
 		edje_decc_lib="-lole32 -luuid"
 		;;
 esac
-
-AC_SUBST(create_shared_lib)
+AC_SUBST(WIN32_CFLAGS)
+AC_SUBST(lt_no_undefined)
+AC_SUBST(lt_enable_auto_import)
 AC_SUBST(edje_decc_lib)
 
 AC_CHECK_FUNCS(realpath)
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 42326c5..e67dd8a 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -36,9 +36,9 @@ edje_prefix.c \
 edje_prefix.h \
 edje_main.h
 
-edje_cc_LDADD = \
-$(top_builddir)/src/lib/libedje.la $(EDJE_LIBS)
-
+edje_cc_CFLAGS = @WIN32_CFLAGS@
+edje_cc_LDADD = $(top_builddir)/src/lib/libedje.la $(EDJE_LIBS)
+edje_cc_LDFLAGS = @lt_enable_auto_import@
 edje_cc_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
 
 
@@ -48,7 +48,7 @@ edje_decc.h \
 edje_cc_mem.c \
 edje_cc_sources.c
 
-edje_decc_LDADD = \
-$(top_builddir)/src/lib/libedje.la @edje_decc_lib@ $(EDJE_LIBS)
-
+edje_decc_CFLAGS = @WIN32_CFLAGS@
+edje_decc_LDADD = $(top_builddir)/src/lib/libedje.la @edje_decc_lib@ $(EDJE_LIBS)
+edje_decc_LDFLAGS = @lt_enable_auto_import@
 edje_decc_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
diff --git a/src/lib/Edje.h b/src/lib/Edje.h
index deba12c..dca43bc 100644
--- a/src/lib/Edje.h
+++ b/src/lib/Edje.h
@@ -4,14 +4,19 @@
 #include <Evas.h>
 
 #ifdef EAPI
-#undef EAPI
+# undef EAPI
 #endif
-#ifdef _MSC_VER
-# ifdef BUILDING_DLL
-#  define EAPI __declspec(dllexport)
+
+#ifdef _WIN32
+# ifdef EFL_EDJE_BUILD
+#  ifdef DLL_EXPORT
+#   define EAPI __declspec(dllexport)
+#  else
+#   define EAPI
+#  endif /* ! DLL_EXPORT */
 # else
 #  define EAPI __declspec(dllimport)
-# endif
+# endif /* ! EFL_EDJE_BUILD */
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
diff --git a/src/lib/Edje_Edit.h b/src/lib/Edje_Edit.h
index ffdbb0c..f1634bd 100644
--- a/src/lib/Edje_Edit.h
+++ b/src/lib/Edje_Edit.h
@@ -4,14 +4,19 @@
 #include <Evas.h>
 
 #ifdef EAPI
-#undef EAPI
+# undef EAPI
 #endif
-#ifdef _MSC_VER
-# ifdef BUILDING_DLL
-#  define EAPI __declspec(dllexport)
+
+#ifdef _WIN32
+# ifdef EFL_EDJE_BUILD
+#  ifdef DLL_EXPORT
+#   define EAPI __declspec(dllexport)
+#  else
+#   define EAPI
+#  endif /* ! DLL_EXPORT */
 # else
 #  define EAPI __declspec(dllimport)
-# endif
+# endif /* ! EFL_EDJE_BUILD */
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 48f4918..0a40295 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -41,7 +41,7 @@ edje_textblock_styles.c \
 edje_edit.c \
 edje_script_only.c
 
-libedje_la_LIBADD       = -lm @EDJE_LIBS@
+libedje_la_CFLAGS = @WIN32_CFLAGS@
+libedje_la_LIBADD = @EDJE_LIBS@ -lm
 libedje_la_DEPENDENCIES = $(top_builddir)/config.h
-libedje_la_LDFLAGS      = @create_shared_lib@ -version-info @version_info@
-
+libedje_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@
diff --git a/src/lib/edje_private.h b/src/lib/edje_private.h
index c9934c2..3e61a9b 100644
--- a/src/lib/edje_private.h
+++ b/src/lib/edje_private.h
@@ -39,14 +39,19 @@ void *alloca (size_t);
 
 
 #ifdef EAPI
-#undef EAPI
+# undef EAPI
 #endif
-#ifdef _MSC_VER
-# ifdef BUILDING_DLL
-#  define EAPI __declspec(dllexport)
+
+#ifdef _WIN32
+# ifdef EFL_EDJE_BUILD
+#  ifdef DLL_EXPORT
+#   define EAPI __declspec(dllexport)
+#  else
+#   define EAPI
+#  endif /* ! DLL_EXPORT */
 # else
 #  define EAPI __declspec(dllimport)
-# endif
+# endif /* ! EFL_EDJE_BUILD */
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4

-- 
Enlightenment DR17 graphical layout and animation library