kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

autotools fixes 

* remove useless _DEPENDENCIES variables
 * remove useless files in EXTRA_DIST
 * use -no-undefied directly
 * add some flags when the host is windows ce

make distcheck succeeds on my computer

next step will be to fix the horrible mess in Ecore.h and ecore_private.h


SVN revision: 37406
This commit is contained in:
Vincent Torri 2008-11-02 09:01:35 +00:00
parent 36a04eb80a
commit 9b19b7dec4
22 changed files with 77 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
legacy/ecore/configure.ac
View File

@ -65,12 +65,12 @@ PKG_PROG_PKG_CONFIG
PKG_CHECK_MODULES([EINA], [eina-0])
dnl add windows requirements
WIN32_CPPFLAGS=""
WIN32_CFLAGS=""
WIN32_LIBS=""
lt_no_undefined=""
lt_enable_auto_import=""
case "$host_os" in
mingw*|cegcc)
mingw* | cegcc*)
PKG_CHECK_MODULES([EVIL], [evil])
AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed.])
dnl needed for correct definition of EAPI
@ -88,23 +88,29 @@ case "$host_os" in
AC_DEFINE(HAVE_SYS_TIME_H, 1, [Define to 1 if you have the <sys/time.h> header file.])
if test "$host_os" = "cegcc" ; then
AC_DEFINE(EFL_ECORE_WINCE_BUILD, 1, [Define to mention that ecore WinCE is built.])
WIN32_CFLAGS="-mwin32"
WIN32_LIBS="-lws2 -laygshell"
lt_enable_auto_import="-Wl,--enable-auto-import"
WIN32_CPPFLAGS="-D_WIN32_WCE=0x0420"
WIN32_CFLAGS="-mwin32"
WIN32_LIBS="-lws2 -laygshell"
else
WIN32_LIBS="-lws2_32"
if test "$host_os" = "mingw32ce" ; then
AC_DEFINE(EFL_ECORE_WINCE_BUILD, 1, [Define to mention that ecore WinCE is built.])
WIN32_CPPFLAGS="-D_WIN32_WCE=0x0420"
WIN32_LIBS="-lws2 -laygshell"
else
WIN32_LIBS="-lws2_32"
fi
fi
lt_no_undefined="-no-undefined"
lt_enable_auto_import="-Wl,--enable-auto-import"
;;
*)
AC_CHECK_HEADERS([dlfcn.h features.h langinfo.h locale.h netdb.h netinet/in.h sys/time.h sys/mman.h])
AC_CHECK_HEADERS([dlfcn.h features.h langinfo.h locale.h netdb.h netinet/in.h sys/time.h sys/mman.h signal.h sys/resource.h])
AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
AC_SUBST(dlopen_libs)
;;
esac
AC_SUBST(WIN32_CPPFLAGS)
AC_SUBST(WIN32_CFLAGS)
AC_SUBST(WIN32_LIBS)
AC_SUBST(lt_no_undefined)
AC_SUBST(lt_enable_auto_import)
dnl check common functions and headers

10
legacy/ecore/src/lib/ecore/Ecore.h
View File

@ -50,16 +50,18 @@
*/
#ifndef _ECORE_PRIVATE_H
#include <sys/types.h>
#include <signal.h>
# include <sys/types.h>
# ifndef _WIN32
# include <signal.h>
# endif
#endif
#ifndef TRUE
#define TRUE 1
# define TRUE 1
#endif
#ifndef FALSE
#define FALSE 0
# define FALSE 0
#endif
#ifdef __cplusplus

12
legacy/ecore/src/lib/ecore/Makefile.am
View File

@ -1,6 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
AM_CFLAGS = @WIN32_CFLAGS@ @EINA_CFLAGS@
AM_CPPFLAGS = @EVIL_CFLAGS@ @WIN32_CPPFLAGS@
AM_CFLAGS = @WIN32_CFLAGS@ @EINA_CFLAGS@ @WIN32_CPPFLAGS@
lib_LTLIBRARIES = libecore.la
include_HEADERS = \
@ -30,8 +31,9 @@ ecore_time.c \
ecore_timer.c \
ecore_tree.c \
ecore_value.c \
ecore_poll.c \
ecore_private.h
ecore_poll.c
libecore_la_LIBADD = @dlopen_libs@ @EVIL_LIBS@ @EINA_LIBS@ @WIN32_LIBS@ -lm
libecore_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@
libecore_la_LIBADD = @dlopen_libs@ @EINA_LIBS@ @EVIL_LIBS@ @WIN32_LIBS@ -lm
libecore_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
EXTRA_DIST = ecore_private.h

9
legacy/ecore/src/lib/ecore/ecore_app.c
View File

@ -1,3 +1,12 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#ifdef HAVE_EVIL
# include <Evil.h>
#endif
#include "ecore_private.h"
#include "Ecore.h"

8
legacy/ecore/src/lib/ecore/ecore_private.h
View File

@ -11,12 +11,16 @@
#include <sys/time.h>
#include <sys/types.h>
#include <unistd.h>
#include <signal.h>
#ifdef HAVE_SIGNAL_H
# include <signal.h>
#endif
#include <sys/stat.h>
#include <fcntl.h>
#include <limits.h>
#include <dirent.h>
#include <sys/resource.h>
#ifdef HAVE_SYS_RESOURCE_H
# include <sys/resource.h>
#endif
#include <eina_types.h>

14
legacy/ecore/src/lib/ecore_con/Makefile.am
View File

@ -18,8 +18,7 @@ ecore_con.c \
ecore_con_dns.c \
ecore_con_info.c \
ecore_con_ssl.c \
ecore_con_url.c \
ecore_con_private.h
ecore_con_url.c
libecore_con_la_LIBADD = \
$(top_builddir)/src/lib/ecore/libecore.la \
@ -27,15 +26,6 @@ $(top_builddir)/src/lib/ecore/libecore.la \
libecore_con_la_LDFLAGS = -version-info @version_info@
libecore_con_la_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la
endif
EXTRA_DIST = \
ecore_con.c \
ecore_con_dns.c \
ecore_con_info.c \
ecore_con_ssl.c \
ecore_con_url.c \
ecore_con_private.h
EXTRA_DIST = ecore_con_private.h

7
legacy/ecore/src/lib/ecore_config/Makefile.am
View File

@ -51,10 +51,6 @@ $(top_builddir)/src/lib/ecore_ipc/libecore_ipc.la \
@EET_LIBS@ \
@EVAS_LIBS@
libecore_config_la_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la \
$(top_builddir)/src/lib/ecore_ipc/libecore_ipc.la
else
libecore_config_la_SOURCES = \
@ -71,9 +67,6 @@ $(top_builddir)/src/lib/ecore/libecore.la \
@EINA_LIBS@ \
@EVAS_LIBS@
libecore_config_la_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la
endif
endif

17
legacy/ecore/src/lib/ecore_desktop/Makefile.am
View File

@ -21,8 +21,7 @@ ecore_desktop_tree.c \
ecore_desktop_icon.c \
ecore_desktop_menu.c \
ecore_desktop_paths.c \
ecore_desktop_xmlame.c \
ecore_desktop_private.h
ecore_desktop_xmlame.c
libecore_desktop_la_LIBADD = \
$(top_builddir)/src/lib/ecore/libecore.la \
@ -31,18 +30,6 @@ $(top_builddir)/src/lib/ecore_file/libecore_file.la \
libecore_desktop_la_LDFLAGS = -version-info @version_info@
libecore_desktop_la_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la \
$(top_builddir)/src/lib/ecore_file/libecore_file.la
endif
EXTRA_DIST = \
Ecore_Desktop.h \
ecore_desktop.c \
ecore_desktop_tree.c \
ecore_desktop_icon.c \
ecore_desktop_menu.c \
ecore_desktop_paths.c \
ecore_desktop_xmlame.c \
ecore_desktop_private.h
EXTRA_DIST = ecore_desktop_private.h

12
legacy/ecore/src/lib/ecore_evas/Makefile.am
View File

@ -108,17 +108,7 @@ $(top_builddir)/src/lib/ecore/libecore.la \
@EVIL_LIBS@ \
@EINA_LIBS@
libecore_evas_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@
libecore_evas_la_DEPENDENCIES = \
$(ECORE_X_LIB) \
$(ECORE_FB_LIB) \
$(ECORE_DIRECTFB_LIB) \
$(ECORE_WIN32_LIB) \
$(ECORE_SDL_LIB) \
$(ECORE_QUARTZ_LIB) \
$(ECORE_WINCE_LIB) \
$(top_builddir)/src/lib/ecore/libecore.la
libecore_evas_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
endif

8
legacy/ecore/src/lib/ecore_fb/Makefile.am
View File

@ -15,8 +15,7 @@ libecore_fb_la_SOURCES = \
ecore_fb.c \
ecore_fb_vt.c \
ecore_fb_li.c \
ecore_fb_ts.c \
ecore_fb_private.h
ecore_fb_ts.c
# deprecated sources (might not compile):
# ecore_fb_kbd.c
# ecore_fb_ps2.c
@ -28,13 +27,8 @@ $(top_builddir)/src/lib/ecore/libecore.la \
libecore_fb_la_LDFLAGS = -version-info @version_info@
libecore_fb_la_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la
endif
EXTRA_DIST = \
Ecore_Fb.h \
ecore_fb.c \
ecore_fb_private.h \
ecore_fb_keytable.h

11
legacy/ecore/src/lib/ecore_file/Makefile.am
View File

@ -21,7 +21,6 @@ include_HEADERS = Ecore_File.h
libecore_file_la_SOURCES = \
ecore_file.c \
ecore_file_private.h \
ecore_file_monitor.c \
ecore_file_monitor_inotify.c \
ecore_file_monitor_poll.c \
@ -34,15 +33,9 @@ $(lib_ecore_con_la) \
@EVIL_LIBS@ \
@EINA_LIBS@
libecore_file_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@
libecore_file_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
endif
EXTRA_DIST = \
ecore_file.c \
ecore_file_private.h \
ecore_file_monitor.c \
ecore_file_monitor_inotify.c \
ecore_file_monitor_poll.c \
ecore_file_path.c
EXTRA_DIST = ecore_file_private.h

12
legacy/ecore/src/lib/ecore_imf/Makefile.am
View File

@ -15,19 +15,13 @@ Ecore_IMF.h
libecore_imf_la_SOURCES = \
ecore_imf.c \
ecore_imf_context.c \
ecore_imf_module.c \
ecore_imf_private.h
ecore_imf_module.c
libecore_imf_la_LIBADD = \
$(top_builddir)/src/lib/ecore/libecore.la \
@EINA_LIBS@
libecore_imf_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@
libecore_imf_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
endif
EXTRA_DIST = \
Ecore_IMF.h \
ecore_imf.c \
ecore_imf_context.c \
ecore_imf_module.c \
ecore_imf_private.h
EXTRA_DIST = ecore_imf_private.h

9
legacy/ecore/src/lib/ecore_imf_evas/Makefile.am
View File

@ -19,12 +19,5 @@ $(top_builddir)/src/lib/ecore_imf/libecore_imf.la \
@EVAS_LIBS@ \
@EINA_LIBS@
libecore_imf_evas_la_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore_imf/libecore_imf.la
libecore_imf_evas_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@
libecore_imf_evas_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
endif
EXTRA_DIST = \
Ecore_IMF_Evas.h \
ecore_imf_evas.c

11
legacy/ecore/src/lib/ecore_ipc/Makefile.am
View File

@ -16,8 +16,7 @@ include_HEADERS = \
Ecore_Ipc.h
libecore_ipc_la_SOURCES = \
ecore_ipc.c \
ecore_ipc_private.h
ecore_ipc.c
libecore_ipc_la_LIBADD = \
$(top_builddir)/src/lib/ecore/libecore.la \
@ -27,12 +26,6 @@ $(top_builddir)/src/lib/ecore_con/libecore_con.la \
libecore_ipc_la_LDFLAGS = -version-info @version_info@
libecore_ipc_la_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la \
$(top_builddir)/src/lib/ecore_con/libecore_con.la
endif
EXTRA_DIST = \
ecore_ipc.c \
ecore_ipc_private.h
EXTRA_DIST = ecore_ipc_private.h

13
legacy/ecore/src/lib/ecore_job/Makefile.am
View File

@ -14,21 +14,14 @@ include_HEADERS = \
Ecore_Job.h
libecore_job_la_SOURCES = \
ecore_job.c \
ecore_job_private.h
ecore_job.c
libecore_job_la_LIBADD = \
$(top_builddir)/src/lib/ecore/libecore.la \
@EINA_LIBS@
libecore_job_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@
libecore_job_la_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la
libecore_job_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
endif
EXTRA_DIST = \
Ecore_Job.h \
ecore_job.c \
ecore_job_private.h
EXTRA_DIST = ecore_job_private.h

9
legacy/ecore/src/lib/ecore_quartz/Makefile.am
View File

@ -24,13 +24,8 @@ $(top_builddir)/src/lib/ecore/libecore.la \
@QUARTZ_LIBS@ \
@EINA_LIBS@
libecore_quartz_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@
libecore_quartz_la_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la
libecore_quartz_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
endif
EXTRA_DIST = \
Ecore_Quartz.h \
ecore_quartz.m
EXTRA_DIST = ecore_quartz.m

13
legacy/ecore/src/lib/ecore_sdl/Makefile.am
View File

@ -13,22 +13,15 @@ include_HEADERS = \
Ecore_Sdl.h
libecore_sdl_la_SOURCES = \
ecore_sdl.c \
Ecore_Sdl_Keys.h
ecore_sdl.c
libecore_sdl_la_LIBADD = \
$(top_builddir)/src/lib/ecore/libecore.la \
@SDL_LIBS@ \
@EINA_LIBS@
libecore_sdl_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@
libecore_sdl_la_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la
libecore_sdl_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
endif
EXTRA_DIST = \
Ecore_Sdl.h \
Ecore_Sdl_Keys.h \
ecore_sdl.c
EXTRA_DIST = Ecore_Sdl_Keys.h

14
legacy/ecore/src/lib/ecore_txt/Makefile.am
View File

@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore \
@iconv_cflags@
@iconv_cflags@
if BUILD_ECORE_TXT
@ -13,20 +13,14 @@ include_HEADERS = \
Ecore_Txt.h
libecore_txt_la_SOURCES = \
ecore_txt.c \
ecore_txt_private.h
ecore_txt.c
libecore_txt_la_LIBADD = @iconv_libs@ \
@EINA_LIBS@
libecore_txt_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@
libecore_txt_la_DEPENDENCIES =
libecore_txt_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
endif
EXTRA_DIST = \
Ecore_Txt.h \
ecore_txt.c \
ecore_txt_private.h
EXTRA_DIST = ecore_txt_private.h

5
legacy/ecore/src/lib/ecore_win32/Makefile.am
View File

@ -25,9 +25,8 @@ libecore_win32_la_LIBADD = \
$(top_builddir)/src/lib/ecore/libecore.la \
@EINA_LIBS@
libecore_win32_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@
libecore_win32_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
endif
EXTRA_DIST = \
ecore_win32_private.h
EXTRA_DIST = ecore_win32_private.h

5
legacy/ecore/src/lib/ecore_wince/Makefile.am
View File

@ -25,9 +25,8 @@ libecore_wince_la_LIBADD = \
$(top_builddir)/src/lib/ecore/libecore.la \
@EINA_LIBS@
libecore_wince_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@
libecore_wince_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
endif
EXTRA_DIST = \
ecore_wince_private.h
EXTRA_DIST = ecore_wince_private.h

8
legacy/ecore/src/lib/ecore_x/xcb/Makefile.am
View File

@ -25,9 +25,9 @@ AM_CPPFLAGS = \
-I$(top_builddir)/src/lib/ecore_x \
@EINA_CFLAGS@
noinst_LTLIBRARIES = libecore_x_xcb.la
noinst_LTLIBRARIES = libecore_x_xcb.la
libecore_x_xcb_la_SOURCES = \
libecore_x_xcb_la_SOURCES = \
ecore_xcb_atom.c \
ecore_xcb_cursor.c \
ecore_xcb_damage.c \
@ -75,10 +75,6 @@ $(top_builddir)/src/lib/ecore_txt/libecore_txt.la \
libecore_x_xcb_la_LDFLAGS = -version-info @version_info@
libecore_x_xcb_la_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la \
$(top_builddir)/src/lib/ecore_txt/libecore_txt.la
endif
EXTRA_DIST = ecore_xcb_private.h

8
legacy/ecore/src/lib/ecore_x/xlib/Makefile.am
View File

@ -24,9 +24,9 @@ AM_CPPFLAGS = \
-I$(top_builddir)/src/lib/ecore_x \
@EINA_CFLAGS@
noinst_LTLIBRARIES = libecore_x_xlib.la
noinst_LTLIBRARIES = libecore_x_xlib.la
libecore_x_xlib_la_SOURCES = \
libecore_x_xlib_la_SOURCES = \
ecore_x.c \
ecore_x_dnd.c \
ecore_x_sync.c \
@ -73,10 +73,6 @@ $(top_builddir)/src/lib/ecore_txt/libecore_txt.la \
libecore_x_xlib_la_LDFLAGS = -version-info @version_info@
libecore_x_xlib_la_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la \
$(top_builddir)/src/lib/ecore_txt/libecore_txt.la
endif
EXTRA_DIST = ecore_x_private.h