Ecore: some simplifications of the autotools

 * remove --enable-auto-import link flag (useless, now)
 * remove WIN32_C*FLAGS (idem)
 * remove cegcc cases (not supported anymore)
 * use directly win32 macro in Makefile.am

SVN revision: 79399

diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac
index 0c330197f50bf62b93b3de8aa4bbc908f6b0abb7..9a5cd68598226acda50f450f072404bdcfda43a0 100644 (file)
--- a/legacy/ecore/configure.ac
+++ b/legacy/ecore/configure.ac
@@ -423,29 +423,17 @@ case "$host_os" in
       requirements_ecore_file="evil ${requirements_ecore_file}"
       requirements_ecore_imf="evil ${requirements_ecore_imf}"
       requirements_ecore_imf_evas="evil ${requirements_ecore_imf_evas}"
-      EFL_ECORE_BUILD="-DEFL_ECORE_BUILD"
-      EFL_ECORE_CON_BUILD="-DEFL_ECORE_CON_BUILD"
-      EFL_ECORE_EVAS_BUILD="-DEFL_ECORE_EVAS_BUILD"
-      EFL_ECORE_FILE_BUILD="-DEFL_ECORE_FILE_BUILD"
-      EFL_ECORE_IMF_BUILD="-DEFL_ECORE_IMF_BUILD"
-      EFL_ECORE_IMF_EVAS_BUILD="-DEFL_ECORE_IMF_EVAS_BUILD"
-      EFL_ECORE_INPUT_BUILD="-DEFL_ECORE_INPUT_BUILD"
-      EFL_ECORE_INPUT_EVAS_BUILD="-DEFL_ECORE_INPUT_EVAS_BUILD"
-      EFL_ECORE_IPC_BUILD="-DEFL_ECORE_IPC_BUILD"
       ;;
 esac
 
 have_win32=""
 have_wince=""
 case "$host_os" in
-   mingw32ce* | cegcc*)
-      EFL_ECORE_WINCE_BUILD="-DEFL_ECORE_WINCE_BUILD"
+   mingw32ce*)
       requirements_ecore_wince="evil ${requirements_ecore_wince}"
       have_wince="yes"
       ;;
    mingw*)
-      EFL_ECORE_WIN32_BUILD="-DEFL_ECORE_WIN32_BUILD"
-      EFL_ECORE_SDL_BUILD="-DEFL_ECORE_SDL_BUILD"
       requirements_ecore_win32="evil ${requirements_ecore_win32}"
       requirements_ecore_sdl="evil ${requirements_ecore_sdl}"
       have_win32="yes"
@@ -506,7 +494,7 @@ AM_CONDITIONAL(ECORE_HAVE_PS3, test "x${have_ps3}" = "xyes")
 
 WIN32_LIBS=""
 case "$host_os" in
-   mingw32ce* | cegcc*)
+   mingw32ce*)
       WIN32_LIBS="-lws2"
       dlopen_libs="-ldl"
       ;;
@@ -1219,7 +1207,7 @@ AC_SYS_LARGEFILE
 
 have_addrinfo="no"
 case "$host_os" in
-   mingw* | cegcc*)
+   mingw*)
       AC_DEFINE(HAVE_DLFCN_H, 1, [Define to 1 if you have the <dlfcn.h> header file.])
       AC_DEFINE(HAVE_SYS_MMAN_H, 1, [Define to 1 if you have the <sys/mman.h> header file.])
       AC_DEFINE(HAVE_SYS_TIME_H, 1, [Define to 1 if you have the <sys/time.h> header file.])
@@ -1375,36 +1363,9 @@ AC_C_BIGENDIAN
 AC_HEADER_STDC
 AC_C___ATTRIBUTE__
 
-WIN32_CPPFLAGS=""
-WIN32_CFLAGS=""
-case "$host_os" in
-   mingw32ce*)
-      WIN32_CPPFLAGS="-D_WIN32_WCE=0x0420"
-      ;;
-   cegcc*)
-      WIN32_CPPFLAGS="-D_WIN32_WCE=0x0420"
-      WIN32_CFLAGS="-mwin32"
-      ;;
-   mingw*)
-      WIN32_CPPFLAGS="-D_WIN32_WINNT=0x0501"
-      ;;
-esac
-AC_SUBST(WIN32_CPPFLAGS)
-AC_SUBST(WIN32_CFLAGS)
-
 
 ### Checks for linker characteristics
 
-# use --enable-auto-import on Windows
-
-lt_enable_auto_import=""
-case "$host_os" in
-   mingw* | cegcc*)
-      lt_enable_auto_import="-Wl,--enable-auto-import"
-      ;;
-esac
-AC_SUBST(lt_enable_auto_import)
-
 ### Checks for library functions
 AC_ISC_POSIX
 AC_FUNC_ALLOCA

diff --git a/legacy/ecore/src/examples/Makefile.am b/legacy/ecore/src/examples/Makefile.am
index 00ea91df39ee06fa3390e5d4db4047ab26f3f48d..e17110621c60f805d46a2f24075f0588f36da992 100644 (file)
--- a/legacy/ecore/src/examples/Makefile.am
+++ b/legacy/ecore/src/examples/Makefile.am
@@ -12,7 +12,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore_input \
 -I$(top_srcdir)/src/lib/ecore_con \
 -DPACKAGE_EXAMPLES_DIR=\"$(datadir)/$(PACKAGE)/examples\" \
-@GLIB_CFLAGS@ @EVIL_CFLAGS@ @EVAS_CFLAGS@ @EINA_CFLAGS@ @WIN32_CPPFLAGS@ @EFL_ECORE_BUILD@
+@GLIB_CFLAGS@ @EVIL_CFLAGS@ @EVAS_CFLAGS@ @EINA_CFLAGS@ @EFL_ECORE_BUILD@
 
 ECOREBASELDADD = \
        $(top_builddir)/src/lib/ecore/libecore.la \

diff --git a/legacy/ecore/src/lib/ecore/Makefile.am b/legacy/ecore/src/lib/ecore/Makefile.am
index 6f14387e5b56c6ec0de06fdba9242e59c8d506bc..ee2c9cb630352f028c9b94484b49d7578055ec1c 100644 (file)
--- a/legacy/ecore/src/lib/ecore/Makefile.am
+++ b/legacy/ecore/src/lib/ecore/Makefile.am
@@ -1,7 +1,12 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-AM_CPPFLAGS = @GLIB_CFLAGS@ @EVIL_CFLAGS@ @EINA_CFLAGS@ @WIN32_CPPFLAGS@ @EFL_ECORE_BUILD@
-AM_CFLAGS = @WIN32_CFLAGS@ @EFL_PTHREAD_CFLAGS@
+AM_CPPFLAGS = \
+@GLIB_CFLAGS@ \
+@EVIL_CFLAGS@ \
+@EINA_CFLAGS@ \
+-DEFL_ECORE_BUILD
+
+AM_CFLAGS = @EFL_PTHREAD_CFLAGS@
 
 lib_LTLIBRARIES = libecore.la
 includes_HEADERS = \
@@ -27,7 +32,8 @@ ecore_time.c \
 ecore_timer.c \
 ecore_thread.c \
 ecore_glib.c \
-ecore_throttle.c
+ecore_throttle.c \
+ecore_private.h
 
 if ECORE_HAVE_WIN32
 
@@ -64,6 +70,4 @@ endif
 endif
 
 libecore_la_LIBADD = @dlopen_libs@ @EINA_LIBS@ @EVIL_LIBS@ @GLIB_LIBS@ @WIN32_LIBS@ @LTLIBINTL@ @EFL_PTHREAD_LIBS@ @rt_libs@ -lm
-libecore_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@
-
-EXTRA_DIST = ecore_private.h
+libecore_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@

diff --git a/legacy/ecore/src/lib/ecore/ecore_thread.c b/legacy/ecore/src/lib/ecore/ecore_thread.c
index dda126da44f4d82b95e49d47b0e35598e2b53cb3..359ac72190976d444af4b0f6cd46734a19a46eaf 100644 (file)
--- a/legacy/ecore/src/lib/ecore/ecore_thread.c
+++ b/legacy/ecore/src/lib/ecore/ecore_thread.c
@@ -530,9 +530,6 @@ _ecore_thread_init(void)
      _ecore_thread_count_max = 1;
 
 #ifdef EFL_HAVE_THREADS
-# ifdef EFL_HAVE_WIN32_THREADS
-   LKI(_ecore_thread_win32_lock);
-# endif
    LKI(_ecore_pending_job_threads_mutex);
    LRWKI(_ecore_thread_global_hash_lock);
    LKI(_ecore_thread_global_hash_mutex);
@@ -611,9 +608,6 @@ _ecore_thread_shutdown(void)
     LKD(_ecore_thread_global_hash_mutex);
     LKD(_ecore_running_job_mutex);
     CDD(_ecore_thread_global_hash_cond);
-# ifdef EFL_HAVE_WIN32_THREADS
-   LKU(_ecore_thread_win32_lock);
-# endif
 #endif
 }
 

diff --git a/legacy/ecore/src/lib/ecore_con/Makefile.am b/legacy/ecore/src/lib/ecore_con/Makefile.am
index ce656f76daaf2921659a6465b829ec6e1085a9a1..d17410b626097a4a7d44b2ede0c44bab38d1ba2e 100644 (file)
--- a/legacy/ecore/src/lib/ecore_con/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_con/Makefile.am
@@ -5,15 +5,14 @@ AM_CPPFLAGS = \
 -I$(top_builddir)/src/lib/ecore_con \
 -I$(top_srcdir)/src/lib/ecore \
 -I$(top_srcdir)/src/lib/ecore_con \
-@EFL_ECORE_CON_BUILD@ \
+-DEFL_ECORE_CON_BUILD \
 @SSL_CFLAGS@ \
 @CURL_CFLAGS@ \
 @EVIL_CFLAGS@ \
 @EINA_CFLAGS@ \
 @TLS_CFLAGS@ \
 @CARES_CFLAGS@ \
-@EET_CFLAGS@ \
-@WIN32_CPPFLAGS@
+@EET_CFLAGS@
 
 lib_LTLIBRARIES = libecore_con.la
 includes_HEADERS = Ecore_Con.h
@@ -24,9 +23,8 @@ ecore_con.c \
 ecore_con_socks.c \
 ecore_con_ssl.c \
 ecore_con_url.c \
-ecore_con_alloc.c
-
-libecore_con_la_CFLAGS = @WIN32_CFLAGS@
+ecore_con_alloc.c \
+ecore_con_private.h
 
 if ECORE_HAVE_WIN32
 libecore_con_la_SOURCES += ecore_con_local_win32.c
@@ -38,7 +36,7 @@ if HAVE_CARES
 libecore_con_la_SOURCES += ecore_con_ares.c
 else
 if HAVE_IPV6
-libecore_con_la_CFLAGS += @ECORE_CON_CFLAGS@
+libecore_con_la_CFLAGS = @ECORE_CON_CFLAGS@
 libecore_con_la_SOURCES += ecore_con_dns.c dns.c dns.h
 else
 libecore_con_la_SOURCES += ecore_con_info.c
@@ -54,6 +52,4 @@ libecore_con_la_LIBADD = \
 $(top_builddir)/src/lib/ecore/libecore.la \
 @SSL_LIBS@ @CURL_LIBS@ @EINA_LIBS@ @EVIL_LIBS@ @TLS_LIBS@ @CARES_LIBS@ @WIN32_LIBS@ @EET_LIBS@
 
-libecore_con_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
-
-EXTRA_DIST = ecore_con_private.h
+libecore_con_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@

diff --git a/legacy/ecore/src/lib/ecore_evas/Makefile.am b/legacy/ecore/src/lib/ecore_evas/Makefile.am
index db77449a60f26db8aac8ab56d37b331b02f760a9..1efabf75aec3230b192695c8b8a68fd17295045a 100644 (file)
--- a/legacy/ecore/src/lib/ecore_evas/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_evas/Makefile.am
@@ -93,7 +93,7 @@ AM_CPPFLAGS = \
 -I$(top_builddir)/src/lib/ecore_evas \
 -I$(top_builddir)/src/lib/ecore_input \
 -I$(top_builddir)/src/lib/ecore_input_evas \
-@EFL_ECORE_EVAS_BUILD@ \
+-DEFL_ECORE_EVAS_BUILD \
 $(ECORE_X_INC) \
 $(ECORE_FB_INC) \
 $(ECORE_DIRECTFB_INC) \
@@ -109,8 +109,6 @@ $(ECORE_IPC_INC) \
 @EVIL_CFLAGS@ \
 @WAYLAND_EGL_CFLAGS@
 
-AM_CFLAGS = @WIN32_CFLAGS@
-
 lib_LTLIBRARIES = libecore_evas.la
 includes_HEADERS = Ecore_Evas.h
 includesdir = $(includedir)/ecore-@VMAJ@
@@ -130,7 +128,8 @@ ecore_evas_ews.c \
 ecore_evas_psl1ght.c \
 ecore_evas_wayland_shm.c \
 ecore_evas_wayland_egl.c \
-ecore_evas_extn.c
+ecore_evas_extn.c \
+ecore_evas_private.h
 
 if BUILD_ECORE_WAYLAND
 libecore_evas_la_SOURCES += \
@@ -159,7 +158,4 @@ $(top_builddir)/src/lib/ecore/libecore.la \
 @EFL_SHM_OPEN_LIBS@ \
 @WAYLAND_EGL_LIBS@
 
-libecore_evas_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
-
-EXTRA_DIST = \
-ecore_evas_private.h
+libecore_evas_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@

diff --git a/legacy/ecore/src/lib/ecore_file/Makefile.am b/legacy/ecore/src/lib/ecore_file/Makefile.am
index ab23ace4f579a7a0f0c259b32eb1fd80fecd7820..d50d7454c0622ec74f62046ebba57ae200f3f899 100644 (file)
--- a/legacy/ecore/src/lib/ecore_file/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_file/Makefile.am
@@ -4,13 +4,10 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore \
 -I$(top_srcdir)/src/lib/ecore_con \
 -I$(top_builddir)/src/lib/ecore \
-@EFL_ECORE_FILE_BUILD@ \
+-DEFL_ECORE_FILE_BUILD \
 @CURL_CFLAGS@ \
 @EVIL_CFLAGS@ \
-@EINA_CFLAGS@ \
-@WIN32_CPPFLAGS@
-
-AM_CFLAGS = @WIN32_CFLAGS@
+@EINA_CFLAGS@
 
 if BUILD_ECORE_CON
 lib_ecore_con_la = $(top_builddir)/src/lib/ecore_con/libecore_con.la
@@ -27,7 +24,8 @@ ecore_file_monitor_inotify.c \
 ecore_file_monitor_win32.c \
 ecore_file_monitor_poll.c \
 ecore_file_path.c \
-ecore_file_download.c
+ecore_file_download.c \
+ecore_file_private.h
 
 libecore_file_la_LIBADD = \
 $(top_builddir)/src/lib/ecore/libecore.la \
@@ -35,7 +33,4 @@ $(lib_ecore_con_la) \
 @EVIL_LIBS@ \
 @EINA_LIBS@
 
-libecore_file_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
-
-EXTRA_DIST = ecore_file_private.h
-
+libecore_file_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@

diff --git a/legacy/ecore/src/lib/ecore_imf/Makefile.am b/legacy/ecore/src/lib/ecore_imf/Makefile.am
index 10f6c2f458d689fcd8a2b7e812d7879e7378a26c..49416fb73b9ca3d17a88fde6f8dab71d803e4a67 100644 (file)
--- a/legacy/ecore/src/lib/ecore_imf/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_imf/Makefile.am
@@ -3,12 +3,10 @@ MAINTAINERCLEANFILES = Makefile.in
 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
-@EFL_ECORE_IMF_BUILD@ \
+-DEFL_ECORE_IMF_BUILD \
 @EVIL_CFLAGS@ \
 @EINA_CFLAGS@
 
-AM_CFLAGS = @WIN32_CFLAGS@
-
 lib_LTLIBRARIES = libecore_imf.la
 includes_HEADERS = Ecore_IMF.h
 includesdir = $(includedir)/ecore-@VMAJ@
@@ -16,13 +14,12 @@ includesdir = $(includedir)/ecore-@VMAJ@
 libecore_imf_la_SOURCES = \
 ecore_imf.c \
 ecore_imf_context.c \
-ecore_imf_module.c
+ecore_imf_module.c \
+ecore_imf_private.h
 
 libecore_imf_la_LIBADD = \
 $(top_builddir)/src/lib/ecore/libecore.la \
 @EINA_LIBS@ \
 @EVIL_LIBS@
 
-libecore_imf_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
-
-EXTRA_DIST = ecore_imf_private.h
+libecore_imf_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@

diff --git a/legacy/ecore/src/lib/ecore_imf_evas/Makefile.am b/legacy/ecore/src/lib/ecore_imf_evas/Makefile.am
index fa5c49183b4b24168806d7c7c1f04b8ea7ab0f57..92cca0090f3e7a7aeabcea5962f50e6b783a60d0 100644 (file)
--- a/legacy/ecore/src/lib/ecore_imf_evas/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_imf_evas/Makefile.am
@@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore \
 -I$(top_srcdir)/src/lib/ecore_imf \
-@EFL_ECORE_IMF_EVAS_BUILD@ \
+-DEFL_ECORE_IMF_EVAS_BUILD \
 @EVAS_CFLAGS@ \
 @EINA_CFLAGS@
 
@@ -19,4 +19,4 @@ $(top_builddir)/src/lib/ecore_imf/libecore_imf.la \
 @EVAS_LIBS@ \
 @EINA_LIBS@
 
-libecore_imf_evas_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
+libecore_imf_evas_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@

diff --git a/legacy/ecore/src/lib/ecore_input/Makefile.am b/legacy/ecore/src/lib/ecore_input/Makefile.am
index da00da7fad4432a667d35393a466e1e3dda95d5d..ee9f5b57f36aca56ae53a00b0406cd5c821c39d3 100644 (file)
--- a/legacy/ecore/src/lib/ecore_input/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_input/Makefile.am
@@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore \
 -I$(top_builddir)/src/lib/ecore \
-@EFL_ECORE_INPUT_BUILD@ \
+-DEFL_ECORE_INPUT_BUILD \
 @EINA_CFLAGS@ \
 @EVIL_CFLAGS@
 
@@ -14,13 +14,12 @@ includesdir = $(includedir)/ecore-@VMAJ@
 libecore_input_la_SOURCES = \
 ecore_input.c \
 ecore_input_compose.c \
-ecore_input_compose.h
+ecore_input_compose.h \
+ecore_input_private.h
 
 libecore_input_la_LIBADD = \
 $(top_builddir)/src/lib/ecore/libecore.la \
 @EINA_LIBS@ \
 @EVIL_LIBS@
 
-libecore_input_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
-
-EXTRA_DIST = ecore_input_private.h
+libecore_input_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@

diff --git a/legacy/ecore/src/lib/ecore_input_evas/Makefile.am b/legacy/ecore/src/lib/ecore_input_evas/Makefile.am
index ab5cd3bee274cf3dadeba0dde1b585887fc6404c..c626c12ea2a50a27049e883aed78d8080da30539 100644 (file)
--- a/legacy/ecore/src/lib/ecore_input_evas/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_input_evas/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = \
 -I$(top_builddir)/src/lib/ecore_input \
 -I$(top_srcdir)/src/lib/ecore \
 -I$(top_builddir)/src/lib/ecore \
-@EFL_ECORE_INPUT_EVAS_BUILD@ \
+-DEFL_ECORE_INPUT_EVAS_BUILD \
 @EVAS_CFLAGS@ \
 @EINA_CFLAGS@ \
 @EVIL_CFLAGS@
@@ -15,7 +15,8 @@ includes_HEADERS = Ecore_Input_Evas.h
 includesdir = $(includedir)/ecore-@VMAJ@
 
 libecore_input_evas_la_SOURCES = \
-ecore_input_evas.c
+ecore_input_evas.c \
+ecore_input_evas_private.h
 
 libecore_input_evas_la_LIBADD = \
 $(top_builddir)/src/lib/ecore_input/libecore_input.la \
@@ -24,6 +25,4 @@ $(top_builddir)/src/lib/ecore/libecore.la \
 @EINA_LIBS@ \
 @EVIL_LIBS@
 
-libecore_input_evas_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
-
-EXTRA_DIST = ecore_input_evas_private.h
+libecore_input_evas_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@

diff --git a/legacy/ecore/src/lib/ecore_ipc/Makefile.am b/legacy/ecore/src/lib/ecore_ipc/Makefile.am
index 60e32d38ca4781ada2790fb62a29f106778c39a5..c7a035248eb3c938c7ec58a5ad808fa059957baf 100644 (file)
--- a/legacy/ecore/src/lib/ecore_ipc/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_ipc/Makefile.am
@@ -7,20 +7,19 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore \
 -I$(top_srcdir)/src/lib/ecore_con \
 -I$(top_srcdir)/src/lib/ecore_ipc \
-@EFL_ECORE_IPC_BUILD@ \
+-DEFL_ECORE_IPC_BUILD \
 @SSL_CFLAGS@ \
 @EVIL_CFLAGS@ \
-@EINA_CFLAGS@ \
-@WIN32_CPPFLAGS@
+@EINA_CFLAGS@
 
 lib_LTLIBRARIES = libecore_ipc.la
 includes_HEADERS = Ecore_Ipc.h
 includesdir = $(includedir)/ecore-@VMAJ@
 
 libecore_ipc_la_SOURCES = \
-ecore_ipc.c
+ecore_ipc.c \
+ecore_ipc_private.h
 
-libecore_ipc_la_CFLAGS = @WIN32_CFLAGS@
 libecore_ipc_la_LIBADD = \
 $(top_builddir)/src/lib/ecore/libecore.la \
 $(top_builddir)/src/lib/ecore_con/libecore_con.la \
@@ -30,5 +29,3 @@ $(top_builddir)/src/lib/ecore_con/libecore_con.la \
 @WIN32_LIBS@
 
 libecore_ipc_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
-
-EXTRA_DIST = ecore_ipc_private.h

diff --git a/legacy/ecore/src/lib/ecore_psl1ght/Makefile.am b/legacy/ecore/src/lib/ecore_psl1ght/Makefile.am
index 8e7328a544567e43fb3e0c7c7ecec2889309d8f0..5c55da222758edbba1668158677044bec197ef04 100644 (file)
--- a/legacy/ecore/src/lib/ecore_psl1ght/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_psl1ght/Makefile.am
@@ -18,13 +18,13 @@ includesdir = $(includedir)/ecore-@VMAJ@
 libecore_psl1ght_la_SOURCES = \
 ecore_psl1ght.c \
 moveutil.c \
-spursutil.c
+spursutil.c \
+Ecore_Psl1ght_Keys.h \
+ecore_psl1ght_private.h
 
 libecore_psl1ght_la_LIBADD = \
 $(top_builddir)/src/lib/ecore/libecore.la \
 $(top_builddir)/src/lib/ecore_input/libecore_input.la \
 @EINA_LIBS@
 
-libecore_psl1ght_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
-
-EXTRA_DIST = Ecore_Psl1ght_Keys.h ecore_psl1ght_private.h
+libecore_psl1ght_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@

diff --git a/legacy/ecore/src/lib/ecore_sdl/Makefile.am b/legacy/ecore/src/lib/ecore_sdl/Makefile.am
index 27210bb6fce54d86f7dadca79e3638a19ad49825..fdd37d2cf248846966b0c5794276c74885c01bae 100644 (file)
--- a/legacy/ecore/src/lib/ecore_sdl/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_sdl/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_builddir)/src/lib/ecore \
 -I$(top_builddir)/src/lib/ecore_evas \
 -I$(top_builddir)/src/lib/ecore_input \
-@EFL_ECORE_SDL_BUILD@ \
+-DEFL_ECORE_SDL_BUILD \
 @SDL_CFLAGS@ \
 @EVAS_CFLAGS@ \
 @EINA_CFLAGS@
@@ -17,13 +17,13 @@ includes_HEADERS = Ecore_Sdl.h
 includesdir = $(includedir)/ecore-@VMAJ@
 
 libecore_sdl_la_SOURCES = \
-ecore_sdl.c
+ecore_sdl.c \
+ecore_sdl_private.h \
+Ecore_Sdl_Keys.h
 
 libecore_sdl_la_LIBADD = \
 $(top_builddir)/src/lib/ecore/libecore.la \
 $(top_builddir)/src/lib/ecore_input/libecore_input.la \
 @SDL_LIBS@ @EVIL_LIBS@ @EINA_LIBS@
 
-libecore_sdl_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
-
-EXTRA_DIST = Ecore_Sdl_Keys.h ecore_sdl_private.h
+libecore_sdl_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@

diff --git a/legacy/ecore/src/lib/ecore_win32/Makefile.am b/legacy/ecore/src/lib/ecore_win32/Makefile.am
index 7031fa57a0d1c9e98685ec11489ee49576f1d168..ecd8b89b6aeed9b2c94296235be2ab62840075e2 100644 (file)
--- a/legacy/ecore/src/lib/ecore_win32/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_win32/Makefile.am
@@ -5,10 +5,9 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore_input \
 -I$(top_builddir)/src/lib/ecore \
 -I$(top_builddir)/src/lib/ecore_input \
-@EFL_ECORE_WIN32_BUILD@ \
+-DEFL_ECORE_WIN32_BUILD \
 @EVIL_CFLAGS@ \
-@EINA_CFLAGS@ \
-@WIN32_CPPFLAGS@
+@EINA_CFLAGS@
 
 lib_LTLIBRARIES = libecore_win32.la
 
@@ -24,7 +23,12 @@ ecore_win32_dnd_data_object.cpp \
 ecore_win32_dnd_drop_source.cpp \
 ecore_win32_dnd_drop_target.cpp \
 ecore_win32_event.c \
-ecore_win32_window.c
+ecore_win32_window.c \
+ecore_win32_private.h \
+ecore_win32_dnd_enumformatetc.h \
+ecore_win32_dnd_data_object.h \
+ecore_win32_dnd_drop_source.h \
+ecore_win32_dnd_drop_target.h
 
 libecore_win32_la_LIBADD = \
 @ecore_win32_libs@ \
@@ -34,11 +38,4 @@ $(top_builddir)/src/lib/ecore_input/libecore_input.la \
 @EINA_LIBS@ \
 @EVIL_LIBS@
 
-libecore_win32_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
-
-EXTRA_DIST = \
-ecore_win32_private.h \
-ecore_win32_dnd_enumformatetc.h \
-ecore_win32_dnd_data_object.h \
-ecore_win32_dnd_drop_source.h \
-ecore_win32_dnd_drop_target.h
+libecore_win32_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@

diff --git a/legacy/ecore/src/lib/ecore_wince/Makefile.am b/legacy/ecore/src/lib/ecore_wince/Makefile.am
index a264ffbebba92c5686a77eb4534072f31d686746..36846c5ef9539c7b7f67c94e8648dc3fb7fa4922 100644 (file)
--- a/legacy/ecore/src/lib/ecore_wince/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_wince/Makefile.am
@@ -5,12 +5,9 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore_input \
 -I$(top_builddir)/src/lib/ecore \
 -I$(top_builddir)/src/lib/ecore_input \
-@EFL_ECORE_WINCE_BUILD@ \
+-DEFL_ECORE_WINCE_BUILD \
 @EVAS_CFLAGS@ \
-@EINA_CFLAGS@ \
-@WIN32_CPPFLAGS@
-
-AM_CFLAGS = @WIN32_CFLAGS@
+@EINA_CFLAGS@
 
 lib_LTLIBRARIES = libecore_wince.la
 
@@ -20,7 +17,8 @@ includesdir = $(includedir)/ecore-@VMAJ@
 libecore_wince_la_SOURCES = \
 ecore_wince.c \
 ecore_wince_event.c \
-ecore_wince_window.c
+ecore_wince_window.c \
+ecore_wince_private.h
 
 libecore_wince_la_LIBADD = \
 @WIN32_LIBS@ \
@@ -30,6 +28,4 @@ $(top_builddir)/src/lib/ecore/libecore.la \
 @EINA_LIBS@ \
 @EVIL_LIBS@
 
-libecore_wince_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
-
-EXTRA_DIST = ecore_wince_private.h
+libecore_wince_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@

diff --git a/legacy/ecore/src/modules/immodules/ibus/Makefile.am b/legacy/ecore/src/modules/immodules/ibus/Makefile.am
index 650970cfd65e71fecb9f6e5945fc63438d0e953a..30f03c97d5c741bcc177a37e4d336550d54754a2 100644 (file)
--- a/legacy/ecore/src/modules/immodules/ibus/Makefile.am
+++ b/legacy/ecore/src/modules/immodules/ibus/Makefile.am
@@ -33,5 +33,5 @@ $(top_builddir)/src/lib/ecore_x/libecore_x.la \
 @IBUS_LIBS@ \
 @EVAS_LIBS@ \
 @EINA_LIBS@
-ibus_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
+ibus_la_LDFLAGS = -no-undefined -module -avoid-version
 ibus_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/legacy/ecore/src/modules/immodules/scim/Makefile.am b/legacy/ecore/src/modules/immodules/scim/Makefile.am
index 40579ca1f4f1908e78b7c60d76a063d969904281..9ce496e0fa74eebaa2cab71bed9e2edce8ced65f 100644 (file)
--- a/legacy/ecore/src/modules/immodules/scim/Makefile.am
+++ b/legacy/ecore/src/modules/immodules/scim/Makefile.am
@@ -32,5 +32,5 @@ scim_la_LIBADD = \
        @SCIM_LIBS@ \
        @EVAS_LIBS@ \
        @EINA_LIBS@
-scim_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
+scim_la_LDFLAGS = -no-undefined -module -avoid-version
 scim_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/legacy/ecore/src/modules/immodules/xim/Makefile.am b/legacy/ecore/src/modules/immodules/xim/Makefile.am
index 57a9068e763e64d4dc2f5b4caeddfd2c408bccb4..e0e7c2d0d7015974c852a0676c292674624bccf5 100644 (file)
--- a/legacy/ecore/src/modules/immodules/xim/Makefile.am
+++ b/legacy/ecore/src/modules/immodules/xim/Makefile.am
@@ -25,5 +25,5 @@ xim_la_LIBADD = \
         $(top_builddir)/src/lib/ecore_x/libecore_x.la \
        @x_libs@ \
        @EINA_LIBS@
-xim_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
+xim_la_LDFLAGS = -no-undefined -module -avoid-version
 xim_la_LIBTOOLFLAGS = --tag=disable-static