summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordoursse <doursse>2007-11-04 09:29:20 +0000
committerdoursse <doursse@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>2007-11-04 09:29:20 +0000
commitbe1229247ab4bdec55840db1e60bcbe2bddc2171 (patch)
treec8193dda9a02e9b27145682889c3aced1be3fb63
parente21fb0f122a783664102d25ee9055d0fd574f551 (diff)
autostuff improvements:
* use non deprecated version of AC_INIT and AM_INIT_AUTOMAKE and check the required minimal versions. * add bzipped distribution archive * add AC_LIBTOOL_WIN32_DLL * forbid libtool to check fortran * compute libtool versioning from the version of the package * pass the directories based on ${prefix} to the preoprocessor with the -D option * replace INCLUDES, wich is deprecated since 2001 by AM_CPPFLAGS * remove useless -L flags in *_la_LDFLAGS SVN revision: 32338
-rw-r--r--legacy/ecore/configure.in47
-rw-r--r--legacy/ecore/src/bin/Makefile.am10
-rw-r--r--legacy/ecore/src/lib/ecore/Makefile.am6
-rw-r--r--legacy/ecore/src/lib/ecore_con/Makefile.am7
-rw-r--r--legacy/ecore/src/lib/ecore_config/Makefile.am16
-rw-r--r--legacy/ecore/src/lib/ecore_desktop/Makefile.am8
-rw-r--r--legacy/ecore/src/lib/ecore_directfb/Makefile.am9
-rw-r--r--legacy/ecore/src/lib/ecore_evas/Makefile.am26
-rw-r--r--legacy/ecore/src/lib/ecore_fb/Makefile.am11
-rw-r--r--legacy/ecore/src/lib/ecore_file/Makefile.am7
-rw-r--r--legacy/ecore/src/lib/ecore_ipc/Makefile.am8
-rw-r--r--legacy/ecore/src/lib/ecore_job/Makefile.am8
-rw-r--r--legacy/ecore/src/lib/ecore_sdl/Makefile.am7
-rw-r--r--legacy/ecore/src/lib/ecore_txt/Makefile.am12
-rw-r--r--legacy/ecore/src/lib/ecore_win32/Makefile.am10
-rw-r--r--legacy/ecore/src/lib/ecore_x/Makefile.am16
16 files changed, 80 insertions, 128 deletions
diff --git a/legacy/ecore/configure.in b/legacy/ecore/configure.in
index 5c5c784948..5c56aa12e5 100644
--- a/legacy/ecore/configure.in
+++ b/legacy/ecore/configure.in
@@ -1,12 +1,17 @@
1dnl Process this file with autoconf to produce a configure script. 1dnl Process this file with autoconf to produce a configure script.
2rm -f config.cache
2 3
3AC_INIT(configure.in) 4AC_INIT(ecore, 0.9.9.041, enlightenment-devel@lists.sourceforge.net)
5AC_PREREQ(2.52)
6AC_CONFIG_SRCDIR(configure.in)
4AC_CANONICAL_BUILD 7AC_CANONICAL_BUILD
5AC_CANONICAL_HOST 8AC_CANONICAL_HOST
6AC_ISC_POSIX 9AC_ISC_POSIX
7AM_INIT_AUTOMAKE(ecore, 0.9.9.041) 10
11AM_INIT_AUTOMAKE(1.6 dist-bzip2)
8AM_CONFIG_HEADER(config.h) 12AM_CONFIG_HEADER(config.h)
9 13
14AC_PROG_CXX
10AC_C_BIGENDIAN 15AC_C_BIGENDIAN
11AC_PROG_CC 16AC_PROG_CC
12AM_PROG_CC_STDC 17AM_PROG_CC_STDC
@@ -14,38 +19,18 @@ AC_HEADER_STDC
14AC_C_CONST 19AC_C_CONST
15AC_CHECK_SIZEOF(int, 4) 20AC_CHECK_SIZEOF(int, 4)
16AC_CHECK_SIZEOF(long, 4) 21AC_CHECK_SIZEOF(long, 4)
17AM_ENABLE_SHARED
18AM_PROG_LIBTOOL
19AC_C___ATTRIBUTE__ 22AC_C___ATTRIBUTE__
20 23
21if test "x${bindir}" = 'xNONE'; then 24AC_LIBTOOL_WIN32_DLL
22 if test "x${prefix}" = "xNONE"; then 25define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
23 PACKAGE_BIN_DIR="${ac_default_prefix}/bin" 26AC_PROG_LIBTOOL
24 else
25 PACKAGE_BIN_DIR="${prefix}/bin"
26 fi
27else
28 PACKAGE_BIN_DIR="${bindir}"
29fi
30AC_SUBST(PACKAGE_BIN_DIR)
31
32if test "x${libdir}" = 'xNONE'; then
33 if test "x${prefix}" = "xNONE"; then
34 PACKAGE_LIB_DIR="${ac_default_prefix}/lib"
35 else
36 PACKAGE_LIB_DIR="${prefix}/lib"
37 fi
38else
39 PACKAGE_LIB_DIR="${libdir}"
40fi
41AC_SUBST(PACKAGE_LIB_DIR)
42 27
43if test "x${prefix}" = "xNONE"; then 28VMAJ=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $1);}'`
44 PACKAGE_DATA_DIR="${ac_default_prefix}/share/${PACKAGE}" 29VMIN=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $2);}'`
45else 30VMIC=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $3);}'`
46 PACKAGE_DATA_DIR="${prefix}/share/${PACKAGE}" 31SNAP=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $4);}'`
47fi 32version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
48AC_SUBST(PACKAGE_DATA_DIR) 33AC_SUBST(version_info)
49 34
50dnl Use -Wall if we have gcc. 35dnl Use -Wall if we have gcc.
51changequote(,)dnl 36changequote(,)dnl
diff --git a/legacy/ecore/src/bin/Makefile.am b/legacy/ecore/src/bin/Makefile.am
index 89badd1b2c..bc2c0dda00 100644
--- a/legacy/ecore/src/bin/Makefile.am
+++ b/legacy/ecore/src/bin/Makefile.am
@@ -8,15 +8,15 @@ ECORE_CONFIG_PROG =
8ECORE_CONFIG_LIB = 8ECORE_CONFIG_LIB =
9endif 9endif
10 10
11INCLUDES = \ 11AM_CPPFLAGS = \
12-I$(top_srcdir)/src/lib/ecore \ 12-I$(top_srcdir)/src/lib/ecore \
13-I$(top_srcdir)/src/lib/ecore_config \ 13-I$(top_srcdir)/src/lib/ecore_config \
14-I$(top_builddir)/src/lib/ecore \ 14-I$(top_builddir)/src/lib/ecore \
15-I$(top_builddir)/src/lib/ecore_config \ 15-I$(top_builddir)/src/lib/ecore_config \
16@EET_CFLAGS@ \ 16-DPACKAGE_BIN_DIR=\"$(bindir)\" \
17-DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \ 17-DPACKAGE_LIB_DIR=\"$(libdir)\" \
18-DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \ 18-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
19-DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" 19@EET_CFLAGS@
20 20
21bin_PROGRAMS = $(ECORE_CONFIG_PROG) 21bin_PROGRAMS = $(ECORE_CONFIG_PROG)
22 22
diff --git a/legacy/ecore/src/lib/ecore/Makefile.am b/legacy/ecore/src/lib/ecore/Makefile.am
index 34ba943b7b..fb77c8f3a4 100644
--- a/legacy/ecore/src/lib/ecore/Makefile.am
+++ b/legacy/ecore/src/lib/ecore/Makefile.am
@@ -1,6 +1,6 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3INCLUDES = 3AM_CPPFLAGS =
4 4
5lib_LTLIBRARIES = libecore.la 5lib_LTLIBRARIES = libecore.la
6include_HEADERS = \ 6include_HEADERS = \
@@ -33,5 +33,5 @@ ecore_tree.c \
33ecore_value.c \ 33ecore_value.c \
34ecore_private.h 34ecore_private.h
35 35
36libecore_la_LIBADD = -lm @dlopen_libs@ @winsock_libs@ @create_shared_lib@ 36libecore_la_LIBADD = @dlopen_libs@ @winsock_libs@ -lm
37libecore_la_LDFLAGS = -version-info 1:0:0 37libecore_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@
diff --git a/legacy/ecore/src/lib/ecore_con/Makefile.am b/legacy/ecore/src/lib/ecore_con/Makefile.am
index 9b302d4040..c368819948 100644
--- a/legacy/ecore/src/lib/ecore_con/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_con/Makefile.am
@@ -1,15 +1,12 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3INCLUDES = \ 3AM_CPPFLAGS = \
4-I$(top_builddir)/src/lib/ecore \ 4-I$(top_builddir)/src/lib/ecore \
5-I$(top_builddir)/src/lib/ecore_con \ 5-I$(top_builddir)/src/lib/ecore_con \
6-I$(top_srcdir)/src/lib/ecore \ 6-I$(top_srcdir)/src/lib/ecore \
7-I$(top_srcdir)/src/lib/ecore_con \ 7-I$(top_srcdir)/src/lib/ecore_con \
8@SSL_CFLAGS@ @CURL_CFLAGS@ 8@SSL_CFLAGS@ @CURL_CFLAGS@
9 9
10libecore_con_la_LDFLAGS = -version-info 1:0:0 \
11-L$(top_builddir)/src/lib/ecore/.libs
12
13if BUILD_ECORE_CON 10if BUILD_ECORE_CON
14 11
15lib_LTLIBRARIES = libecore_con.la 12lib_LTLIBRARIES = libecore_con.la
@@ -26,6 +23,8 @@ libecore_con_la_LIBADD = \
26$(top_builddir)/src/lib/ecore/libecore.la \ 23$(top_builddir)/src/lib/ecore/libecore.la \
27@SSL_LIBS@ @winsock_libs@ @CURL_LIBS@ 24@SSL_LIBS@ @winsock_libs@ @CURL_LIBS@
28 25
26libecore_con_la_LDFLAGS = -version-info @version_info@
27
29libecore_con_la_DEPENDENCIES = \ 28libecore_con_la_DEPENDENCIES = \
30$(top_builddir)/src/lib/ecore/libecore.la 29$(top_builddir)/src/lib/ecore/libecore.la
31 30
diff --git a/legacy/ecore/src/lib/ecore_config/Makefile.am b/legacy/ecore/src/lib/ecore_config/Makefile.am
index f1a40c4de9..541233de08 100644
--- a/legacy/ecore/src/lib/ecore_config/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_config/Makefile.am
@@ -1,22 +1,19 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3INCLUDES = \ 3AM_CPPFLAGS = \
4-I$(top_srcdir)/src/lib/ecore \ 4-I$(top_srcdir)/src/lib/ecore \
5-I$(top_srcdir)/src/lib/ecore_ipc \ 5-I$(top_srcdir)/src/lib/ecore_ipc \
6-I$(top_srcdir)/ \ 6-I$(top_srcdir)/ \
7-I$(top_builddir)/src/lib/ecore \ 7-I$(top_builddir)/src/lib/ecore \
8-I$(top_builddir)/src/lib/ecore_ipc \ 8-I$(top_builddir)/src/lib/ecore_ipc \
9-I$(top_builddir)/ \ 9-I$(top_builddir)/ \
10@EVAS_CFLAGS@ @EET_CFLAGS@ \ 10-DPACKAGE_BIN_DIR=\"$(bindir)\" \
11-DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \ 11-DPACKAGE_LIB_DIR=\"$(libdir)\" \
12-DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \ 12-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
13-DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" 13@EVAS_CFLAGS@ @EET_CFLAGS@
14 14
15CLEANFILES = $(DB) 15CLEANFILES = $(DB)
16 16
17libecore_config_la_LDFLAGS = -version-info 1:0:0 \
18-L$(top_builddir)/src/lib/ecore/.libs
19
20if BUILD_ECORE_CONFIG 17if BUILD_ECORE_CONFIG
21 18
22#DB = system.db 19#DB = system.db
@@ -30,6 +27,8 @@ lib_LTLIBRARIES = libecore_config.la
30include_HEADERS = \ 27include_HEADERS = \
31Ecore_Config.h 28Ecore_Config.h
32 29
30libecore_config_la_LDFLAGS = -version-info @version_info@
31
33#config_DATA = $(DB) 32#config_DATA = $(DB)
34#configdir = $(pkgdatadir) 33#configdir = $(pkgdatadir)
35 34
@@ -75,7 +74,6 @@ $(top_builddir)/src/lib/ecore/libecore.la
75 74
76endif 75endif
77 76
78
79endif 77endif
80 78
81EXTRA_DIST = \ 79EXTRA_DIST = \
diff --git a/legacy/ecore/src/lib/ecore_desktop/Makefile.am b/legacy/ecore/src/lib/ecore_desktop/Makefile.am
index a0fb73ed1d..99ae4603bd 100644
--- a/legacy/ecore/src/lib/ecore_desktop/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_desktop/Makefile.am
@@ -1,6 +1,6 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3INCLUDES = \ 3AM_CPPFLAGS = \
4-I$(top_srcdir)/src/lib/ecore \ 4-I$(top_srcdir)/src/lib/ecore \
5-I$(top_builddir)/src/lib/ecore_file \ 5-I$(top_builddir)/src/lib/ecore_file \
6-I$(top_builddir)/src/lib/ecore_desktop \ 6-I$(top_builddir)/src/lib/ecore_desktop \
@@ -8,10 +8,6 @@ INCLUDES = \
8-I$(top_srcdir)/src/lib/ecore_file \ 8-I$(top_srcdir)/src/lib/ecore_file \
9-I$(top_srcdir)/src/lib/ecore_desktop 9-I$(top_srcdir)/src/lib/ecore_desktop
10 10
11libecore_desktop_la_LDFLAGS = -version-info 1:0:0 \
12-L$(top_builddir)/src/lib/ecore/.libs \
13-L$(top_builddir)/src/lib/ecore_file/.libs
14
15if BUILD_ECORE_DESKTOP 11if BUILD_ECORE_DESKTOP
16 12
17lib_LTLIBRARIES = libecore_desktop.la 13lib_LTLIBRARIES = libecore_desktop.la
@@ -31,6 +27,8 @@ libecore_desktop_la_LIBADD = \
31$(top_builddir)/src/lib/ecore/libecore.la \ 27$(top_builddir)/src/lib/ecore/libecore.la \
32$(top_builddir)/src/lib/ecore_file/libecore_file.la 28$(top_builddir)/src/lib/ecore_file/libecore_file.la
33 29
30libecore_desktop_la_LDFLAGS = -version-info @version_info@
31
34libecore_desktop_la_DEPENDENCIES = \ 32libecore_desktop_la_DEPENDENCIES = \
35$(top_builddir)/src/lib/ecore/libecore.la \ 33$(top_builddir)/src/lib/ecore/libecore.la \
36$(top_builddir)/src/lib/ecore_file/libecore_file.la 34$(top_builddir)/src/lib/ecore_file/libecore_file.la
diff --git a/legacy/ecore/src/lib/ecore_directfb/Makefile.am b/legacy/ecore/src/lib/ecore_directfb/Makefile.am
index 6d7d4222ef..a2f693b2c2 100644
--- a/legacy/ecore/src/lib/ecore_directfb/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_directfb/Makefile.am
@@ -1,13 +1,10 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3INCLUDES = \ 3AM_CPPFLAGS = \
4-I$(top_srcdir)/src/lib/ecore \ 4-I$(top_srcdir)/src/lib/ecore \
5-I$(top_builddir)/src/lib/ecore \ 5-I$(top_builddir)/src/lib/ecore \
6@DIRECTFB_CFLAGS@ 6@DIRECTFB_CFLAGS@
7 7
8libecore_directfb_la_LDFLAGS = -version-info 1:0:0 \
9-L$(top_builddir)/src/lib/ecore/.libs
10
11if BUILD_ECORE_DIRECTFB 8if BUILD_ECORE_DIRECTFB
12 9
13lib_LTLIBRARIES = libecore_directfb.la 10lib_LTLIBRARIES = libecore_directfb.la
@@ -17,12 +14,14 @@ Ecore_DirectFB.h
17libecore_directfb_la_SOURCES = \ 14libecore_directfb_la_SOURCES = \
18ecore_directfb.c \ 15ecore_directfb.c \
19ecore_directfb_keys.h \ 16ecore_directfb_keys.h \
20ecore_directfb_private.h 17ecore_directfb_private.h
21 18
22libecore_directfb_la_LIBADD = \ 19libecore_directfb_la_LIBADD = \
23$(top_builddir)/src/lib/ecore/libecore.la \ 20$(top_builddir)/src/lib/ecore/libecore.la \
24@DIRECTFB_LIBS@ 21@DIRECTFB_LIBS@
25 22
23libecore_directfb_la_LDFLAGS = -version-info @version_info@
24
26libecore_directfb_la_DEPENDENCIES = \ 25libecore_directfb_la_DEPENDENCIES = \
27$(top_builddir)/src/lib/ecore/libecore.la 26$(top_builddir)/src/lib/ecore/libecore.la
28 27
diff --git a/legacy/ecore/src/lib/ecore_evas/Makefile.am b/legacy/ecore/src/lib/ecore_evas/Makefile.am
index 03b9e8cb94..e2c298bdb8 100644
--- a/legacy/ecore/src/lib/ecore_evas/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_evas/Makefile.am
@@ -3,54 +3,44 @@ MAINTAINERCLEANFILES = Makefile.in
3if BUILD_ECORE_X 3if BUILD_ECORE_X
4ECORE_X_INC = -I$(top_srcdir)/src/lib/ecore_x 4ECORE_X_INC = -I$(top_srcdir)/src/lib/ecore_x
5ECORE_X_LIB = $(top_builddir)/src/lib/ecore_x/libecore_x.la 5ECORE_X_LIB = $(top_builddir)/src/lib/ecore_x/libecore_x.la
6ECORE_X_LDF = -L$(top_builddir)/src/lib/ecore_x/.libs
7else 6else
8ECORE_X_INC = 7ECORE_X_INC =
9ECORE_X_LIB = 8ECORE_X_LIB =
10ECORE_X_LDF =
11endif 9endif
12 10
13if BUILD_ECORE_FB 11if BUILD_ECORE_FB
14ECORE_FB_INC = -I$(top_srcdir)/src/lib/ecore_fb 12ECORE_FB_INC = -I$(top_srcdir)/src/lib/ecore_fb
15ECORE_FB_LIB = $(top_builddir)/src/lib/ecore_fb/libecore_fb.la 13ECORE_FB_LIB = $(top_builddir)/src/lib/ecore_fb/libecore_fb.la
16ECORE_FB_LDF = -L$(top_builddir)/src/lib/ecore_fb/.libs
17else 14else
18ECORE_FB_INC = 15ECORE_FB_INC =
19ECORE_FB_LIB = 16ECORE_FB_LIB =
20ECORE_FB_LDF =
21endif 17endif
22 18
23if BUILD_ECORE_DIRECTFB 19if BUILD_ECORE_DIRECTFB
24ECORE_DIRECTFB_INC = -I$(top_srcdir)/src/lib/ecore_directfb -I@DIRECTFB_CFLAGS@ 20ECORE_DIRECTFB_INC = -I$(top_srcdir)/src/lib/ecore_directfb -I@DIRECTFB_CFLAGS@
25ECORE_DIRECTFB_LIB = $(top_builddir)/src/lib/ecore_directfb/libecore_directfb.la 21ECORE_DIRECTFB_LIB = $(top_builddir)/src/lib/ecore_directfb/libecore_directfb.la
26ECORE_DIRECTFB_LDF = -L$(top_builddir)/src/lib/ecore_directfb/.libs
27else 22else
28ECORE_DIRECTFB_INC = 23ECORE_DIRECTFB_INC =
29ECORE_DIRECTFB_LIB = 24ECORE_DIRECTFB_LIB =
30ECORE_DIRECTFB_LDF =
31endif 25endif
32 26
33if BUILD_ECORE_WIN32 27if BUILD_ECORE_WIN32
34ECORE_WIN32_INC = -I$(top_srcdir)/src/lib/ecore_win32 28ECORE_WIN32_INC = -I$(top_srcdir)/src/lib/ecore_win32
35ECORE_WIN32_LIB = $(top_builddir)/src/lib/ecore_win32/libecore_win32.la 29ECORE_WIN32_LIB = $(top_builddir)/src/lib/ecore_win32/libecore_win32.la
36ECORE_WIN32_LDF = -L$(top_builddir)/src/lib/ecore_win32/.libs
37else 30else
38ECORE_WIN32_INC = 31ECORE_WIN32_INC =
39ECORE_WIN32_LIB = 32ECORE_WIN32_LIB =
40ECORE_WIN32_LDF =
41endif 33endif
42 34
43if BUILD_ECORE_SDL 35if BUILD_ECORE_SDL
44ECORE_SDL_INC = -I$(top_srcdir)/src/lib/ecore_sdl @sdl_cflags@ 36ECORE_SDL_INC = -I$(top_srcdir)/src/lib/ecore_sdl @sdl_cflags@
45ECORE_SDL_LIB = $(top_builddir)/src/lib/ecore_sdl/libecore_sdl.la 37ECORE_SDL_LIB = $(top_builddir)/src/lib/ecore_sdl/libecore_sdl.la
46ECORE_SDL_LDF = -L$(top_builddir)/src/lib/ecore_sdl/.libs
47else 38else
48ECORE_SDL_INC = 39ECORE_SDL_INC =
49ECORE_SDL_LIB = 40ECORE_SDL_LIB =
50ECORE_SDL_LDF =
51endif 41endif
52 42
53INCLUDES = \ 43AM_CPPFLAGS = \
54-I$(top_srcdir)/src/lib/ecore \ 44-I$(top_srcdir)/src/lib/ecore \
55-I$(top_srcdir)/src/lib/ecore_evas \ 45-I$(top_srcdir)/src/lib/ecore_evas \
56-I$(top_builddir)/src/lib/ecore \ 46-I$(top_builddir)/src/lib/ecore \
@@ -63,14 +53,6 @@ $(ECORE_SDL_INC) \
63@EVAS_CFLAGS@ \ 53@EVAS_CFLAGS@ \
64@XCB_CFLAGS@ 54@XCB_CFLAGS@
65 55
66libecore_evas_la_LDFLAGS = -version-info 1:0:0 \
67$(ECORE_X_LDF) \
68$(ECORE_FB_LDF) \
69$(ECORE_DIRECTFB_LDF) \
70$(ECORE_WIN32_LDF) \
71$(ECORE_SDL_LDF) \
72-L$(top_builddir)/src/lib/ecore/.libs
73
74if BUILD_ECORE_EVAS 56if BUILD_ECORE_EVAS
75 57
76lib_LTLIBRARIES = libecore_evas.la 58lib_LTLIBRARIES = libecore_evas.la
@@ -99,6 +81,8 @@ $(top_builddir)/src/lib/ecore/libecore.la \
99@XCB_LIBS@ \ 81@XCB_LIBS@ \
100@create_shared_lib@ 82@create_shared_lib@
101 83
84libecore_evas_la_LDFLAGS = -version-info @version_info@
85
102libecore_evas_la_DEPENDENCIES = \ 86libecore_evas_la_DEPENDENCIES = \
103$(ECORE_X_LIB) \ 87$(ECORE_X_LIB) \
104$(ECORE_FB_LIB) \ 88$(ECORE_FB_LIB) \
diff --git a/legacy/ecore/src/lib/ecore_fb/Makefile.am b/legacy/ecore/src/lib/ecore_fb/Makefile.am
index 92b87fc7f6..82238e156b 100644
--- a/legacy/ecore/src/lib/ecore_fb/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_fb/Makefile.am
@@ -1,12 +1,9 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3INCLUDES = \ 3AM_CPPFLAGS = \
4-I$(top_srcdir)/src/lib/ecore \ 4-I$(top_srcdir)/src/lib/ecore \
5-I$(top_builddir)/src/lib/ecore 5-I$(top_builddir)/src/lib/ecore
6 6
7libecore_fb_la_LDFLAGS = -version-info 1:0:0 \
8-L$(top_builddir)/src/lib/ecore/.libs
9
10if BUILD_ECORE_FB 7if BUILD_ECORE_FB
11 8
12lib_LTLIBRARIES = libecore_fb.la 9lib_LTLIBRARIES = libecore_fb.la
@@ -18,15 +15,17 @@ ecore_fb.c \
18ecore_fb_vt.c \ 15ecore_fb_vt.c \
19ecore_fb_li.c \ 16ecore_fb_li.c \
20ecore_fb_private.h 17ecore_fb_private.h
21# deprecated sources (might not compile): 18# deprecated sources (might not compile):
22# ecore_fb_ts.c 19# ecore_fb_ts.c
23# ecore_fb_kbd.c 20# ecore_fb_kbd.c
24# ecore_fb_ps2.c 21# ecore_fb_ps2.c
25 22
26libecore_fb_la_LIBADD = \ 23libecore_fb_la_LIBADD = \
27@tslib_libs@ \ 24@tslib_libs@ \
28$(top_builddir)/src/lib/ecore/libecore.la 25$(top_builddir)/src/lib/ecore/libecore.la
29 26
27libecore_fb_la_LDFLAGS = -version-info @version_info@
28
30libecore_fb_la_DEPENDENCIES = \ 29libecore_fb_la_DEPENDENCIES = \
31$(top_builddir)/src/lib/ecore/libecore.la 30$(top_builddir)/src/lib/ecore/libecore.la
32 31
diff --git a/legacy/ecore/src/lib/ecore_file/Makefile.am b/legacy/ecore/src/lib/ecore_file/Makefile.am
index 2d5e65acad..a67102b0a9 100644
--- a/legacy/ecore/src/lib/ecore_file/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_file/Makefile.am
@@ -1,13 +1,10 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3INCLUDES = \ 3AM_CPPFLAGS = \
4-I$(top_srcdir)/src/lib/ecore \ 4-I$(top_srcdir)/src/lib/ecore \
5-I$(top_builddir)/src/lib/ecore \ 5-I$(top_builddir)/src/lib/ecore \
6@CURL_CFLAGS@ 6@CURL_CFLAGS@
7 7
8libecore_file_la_LDFLAGS = @create_shared_lib@ -version-info 1:0:0 \
9-L$(top_builddir)/src/lib/ecore/.libs
10
11if BUILD_ECORE_FILE 8if BUILD_ECORE_FILE
12 9
13lib_LTLIBRARIES = libecore_file.la 10lib_LTLIBRARIES = libecore_file.la
@@ -27,6 +24,8 @@ libecore_file_la_LIBADD = \
27$(top_builddir)/src/lib/ecore/libecore.la \ 24$(top_builddir)/src/lib/ecore/libecore.la \
28@fam_libs@ @CURL_LIBS@ @ecore_file_win32_lib@ @winsock_libs@ 25@fam_libs@ @CURL_LIBS@ @ecore_file_win32_lib@ @winsock_libs@
29 26
27libecore_file_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@
28
30endif 29endif
31 30
32EXTRA_DIST = \ 31EXTRA_DIST = \
diff --git a/legacy/ecore/src/lib/ecore_ipc/Makefile.am b/legacy/ecore/src/lib/ecore_ipc/Makefile.am
index 48d8746f13..49ab3a44c1 100644
--- a/legacy/ecore/src/lib/ecore_ipc/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_ipc/Makefile.am
@@ -1,6 +1,6 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3INCLUDES = \ 3AM_CPPFLAGS = \
4-I$(top_builddir)/src/lib/ecore \ 4-I$(top_builddir)/src/lib/ecore \
5-I$(top_builddir)/src/lib/ecore_con \ 5-I$(top_builddir)/src/lib/ecore_con \
6-I$(top_builddir)/src/lib/ecore_ipc \ 6-I$(top_builddir)/src/lib/ecore_ipc \
@@ -9,10 +9,6 @@ INCLUDES = \
9-I$(top_srcdir)/src/lib/ecore_ipc \ 9-I$(top_srcdir)/src/lib/ecore_ipc \
10@SSL_CFLAGS@ 10@SSL_CFLAGS@
11 11
12libecore_ipc_la_LDFLAGS = -version-info 1:0:0 \
13-L$(top_builddir)/src/lib/ecore/.libs \
14-L$(top_builddir)/src/lib/ecore_con/.libs
15
16if BUILD_ECORE_IPC 12if BUILD_ECORE_IPC
17 13
18lib_LTLIBRARIES = libecore_ipc.la 14lib_LTLIBRARIES = libecore_ipc.la
@@ -28,6 +24,8 @@ $(top_builddir)/src/lib/ecore/libecore.la \
28$(top_builddir)/src/lib/ecore_con/libecore_con.la \ 24$(top_builddir)/src/lib/ecore_con/libecore_con.la \
29@SSL_LIBS@ @winsock_libs@ 25@SSL_LIBS@ @winsock_libs@
30 26
27libecore_ipc_la_LDFLAGS = -version-info @version_info@
28
31libecore_ipc_la_DEPENDENCIES = \ 29libecore_ipc_la_DEPENDENCIES = \
32$(top_builddir)/src/lib/ecore/libecore.la \ 30$(top_builddir)/src/lib/ecore/libecore.la \
33$(top_builddir)/src/lib/ecore_con/libecore_con.la 31$(top_builddir)/src/lib/ecore_con/libecore_con.la
diff --git a/legacy/ecore/src/lib/ecore_job/Makefile.am b/legacy/ecore/src/lib/ecore_job/Makefile.am
index 26dee1f634..a4e2ee8457 100644
--- a/legacy/ecore/src/lib/ecore_job/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_job/Makefile.am
@@ -1,13 +1,9 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3INCLUDES = \ 3AM_CPPFLAGS = \
4-I$(top_srcdir)/src/lib/ecore \ 4-I$(top_srcdir)/src/lib/ecore \
5-I$(top_builddir)/src/lib/ecore 5-I$(top_builddir)/src/lib/ecore
6 6
7libecore_job_la_LDFLAGS = -version-info 1:0:0 \
8@create_shared_lib@ \
9-L$(top_builddir)/src/lib/ecore/.libs
10
11if BUILD_ECORE_JOB 7if BUILD_ECORE_JOB
12 8
13lib_LTLIBRARIES = libecore_job.la 9lib_LTLIBRARIES = libecore_job.la
@@ -21,6 +17,8 @@ ecore_job_private.h
21libecore_job_la_LIBADD = \ 17libecore_job_la_LIBADD = \
22$(top_builddir)/src/lib/ecore/libecore.la 18$(top_builddir)/src/lib/ecore/libecore.la
23 19
20libecore_job_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@
21
24libecore_job_la_DEPENDENCIES = \ 22libecore_job_la_DEPENDENCIES = \
25$(top_builddir)/src/lib/ecore/libecore.la 23$(top_builddir)/src/lib/ecore/libecore.la
26 24
diff --git a/legacy/ecore/src/lib/ecore_sdl/Makefile.am b/legacy/ecore/src/lib/ecore_sdl/Makefile.am
index 220998510d..8097bd2924 100644
--- a/legacy/ecore/src/lib/ecore_sdl/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_sdl/Makefile.am
@@ -1,13 +1,10 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3INCLUDES = \ 3AM_CPPFLAGS = \
4-I$(top_srcdir)/src/lib/ecore \ 4-I$(top_srcdir)/src/lib/ecore \
5-I$(top_builddir)/src/lib/ecore \ 5-I$(top_builddir)/src/lib/ecore \
6@sdl_cflags@ 6@sdl_cflags@
7 7
8libecore_sdl_la_LDFLAGS = -version-info 1:0:0 \
9-L$(top_builddir)/src/lib/ecore/.libs
10
11if BUILD_ECORE_SDL 8if BUILD_ECORE_SDL
12 9
13lib_LTLIBRARIES = libecore_sdl.la 10lib_LTLIBRARIES = libecore_sdl.la
@@ -22,6 +19,8 @@ libecore_sdl_la_LIBADD = \
22$(top_builddir)/src/lib/ecore/libecore.la \ 19$(top_builddir)/src/lib/ecore/libecore.la \
23@sdl_libs@ @create_shared_lib@ 20@sdl_libs@ @create_shared_lib@
24 21
22libecore_sdl_la_LDFLAGS = -version-info @version_info@
23
25libecore_sdl_la_DEPENDENCIES = \ 24libecore_sdl_la_DEPENDENCIES = \
26$(top_builddir)/src/lib/ecore/libecore.la 25$(top_builddir)/src/lib/ecore/libecore.la
27 26
diff --git a/legacy/ecore/src/lib/ecore_txt/Makefile.am b/legacy/ecore/src/lib/ecore_txt/Makefile.am
index 98a0a29cdf..9d8c3bda8e 100644
--- a/legacy/ecore/src/lib/ecore_txt/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_txt/Makefile.am
@@ -1,17 +1,14 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3INCLUDES = \ 3AM_CPPFLAGS = \
4-I$(top_srcdir)/src/lib/ecore \ 4-I$(top_srcdir)/src/lib/ecore \
5-I$(top_builddir)/src/lib/ecore \ 5-I$(top_builddir)/src/lib/ecore \
6@iconv_cflags@ 6@iconv_cflags@
7 7
8libecore_txt_la_LDFLAGS = -version-info 1:0:0 \
9@create_shared_lib@ \
10-L$(top_builddir)/src/lib/ecore/.libs
11
12if BUILD_ECORE_TXT 8if BUILD_ECORE_TXT
13 9
14lib_LTLIBRARIES = libecore_txt.la 10lib_LTLIBRARIES = libecore_txt.la
11
15include_HEADERS = \ 12include_HEADERS = \
16Ecore_Txt.h 13Ecore_Txt.h
17 14
@@ -19,10 +16,9 @@ libecore_txt_la_SOURCES = \
19ecore_txt.c \ 16ecore_txt.c \
20ecore_txt_private.h 17ecore_txt_private.h
21 18
22# FIXME: may have to link with -liconv 19libecore_txt_la_LIBADD = @iconv_libs@
23libecore_txt_la_LIBADD = \
24@iconv_libs@
25 20
21libecore_txt_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@
26 22
27libecore_txt_la_DEPENDENCIES = 23libecore_txt_la_DEPENDENCIES =
28 24
diff --git a/legacy/ecore/src/lib/ecore_win32/Makefile.am b/legacy/ecore/src/lib/ecore_win32/Makefile.am
index a9bd0fba37..bc920e72e2 100644
--- a/legacy/ecore/src/lib/ecore_win32/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_win32/Makefile.am
@@ -1,18 +1,14 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3INCLUDES = \ 3AM_CPPFLAGS = \
4-I$(top_srcdir)/src/lib/ecore \ 4-I$(top_srcdir)/src/lib/ecore \
5-I$(top_builddir)/src/lib/ecore 5-I$(top_builddir)/src/lib/ecore
6 6
7libecore_win32_la_LDFLAGS = \
8-version-info 1:0:0 \
9@create_shared_lib@ \
10-L$(top_builddir)/src/lib/ecore/.libs
11
12 7
13if BUILD_ECORE_WIN32 8if BUILD_ECORE_WIN32
14 9
15lib_LTLIBRARIES = libecore_win32.la 10lib_LTLIBRARIES = libecore_win32.la
11
16include_HEADERS = \ 12include_HEADERS = \
17Ecore_Win32.h 13Ecore_Win32.h
18 14
@@ -30,6 +26,8 @@ libecore_win32_la_LIBADD = \
30-lwsock32 \ 26-lwsock32 \
31$(top_builddir)/src/lib/ecore/libecore.la 27$(top_builddir)/src/lib/ecore/libecore.la
32 28
29libecore_win32_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@
30
33endif 31endif
34 32
35EXTRA_DIST = \ 33EXTRA_DIST = \
diff --git a/legacy/ecore/src/lib/ecore_x/Makefile.am b/legacy/ecore/src/lib/ecore_x/Makefile.am
index 8d131d0fdd..d7b44d3c37 100644
--- a/legacy/ecore/src/lib/ecore_x/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_x/Makefile.am
@@ -1,7 +1,7 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3if BUILD_ECORE_X_XCB 3if BUILD_ECORE_X_XCB
4INCLUDES = \ 4AM_CPPFLAGS = \
5@XCB_DAMAGE_CFLAGS@ \ 5@XCB_DAMAGE_CFLAGS@ \
6@XCB_COMPOSITE_CFLAGS@ \ 6@XCB_COMPOSITE_CFLAGS@ \
7@XCB_DPMS_CFLAGS@ \ 7@XCB_DPMS_CFLAGS@ \
@@ -19,7 +19,7 @@ INCLUDES = \
19-I$(top_builddir)/src/lib/ecore \ 19-I$(top_builddir)/src/lib/ecore \
20-I$(top_builddir)/src/lib/ecore_txt 20-I$(top_builddir)/src/lib/ecore_txt
21else 21else
22INCLUDES = \ 22AM_CPPFLAGS = \
23@Xcursor_cflags@ \ 23@Xcursor_cflags@ \
24@XDAMAGE_CFLAGS@ \ 24@XDAMAGE_CFLAGS@ \
25@XCOMPOSITE_CFLAGS@ \ 25@XCOMPOSITE_CFLAGS@ \
@@ -37,10 +37,6 @@ INCLUDES = \
37-I$(top_builddir)/src/lib/ecore_txt 37-I$(top_builddir)/src/lib/ecore_txt
38endif 38endif
39 39
40libecore_x_la_LDFLAGS = -version-info 1:0:0 \
41-L$(top_builddir)/src/lib/ecore/.libs \
42-L$(top_builddir)/src/lib/ecore_txt/.libs
43
44if BUILD_ECORE_X_XCB 40if BUILD_ECORE_X_XCB
45 41
46lib_LTLIBRARIES = libecore_x.la 42lib_LTLIBRARIES = libecore_x.la
@@ -93,11 +89,13 @@ libecore_x_la_LIBADD = \
93$(top_builddir)/src/lib/ecore/libecore.la \ 89$(top_builddir)/src/lib/ecore/libecore.la \
94$(top_builddir)/src/lib/ecore_txt/libecore_txt.la 90$(top_builddir)/src/lib/ecore_txt/libecore_txt.la
95 91
92libecore_x_la_LDFLAGS = -version-info @version_info@
93
96libecore_x_la_DEPENDENCIES = \ 94libecore_x_la_DEPENDENCIES = \
97$(top_builddir)/src/lib/ecore/libecore.la \ 95$(top_builddir)/src/lib/ecore/libecore.la \
98$(top_builddir)/src/lib/ecore_txt/libecore_txt.la 96$(top_builddir)/src/lib/ecore_txt/libecore_txt.la
99 97
100endif 98else
101 99
102if BUILD_ECORE_X 100if BUILD_ECORE_X
103 101
@@ -149,12 +147,16 @@ libecore_x_la_LIBADD = \
149$(top_builddir)/src/lib/ecore/libecore.la \ 147$(top_builddir)/src/lib/ecore/libecore.la \
150$(top_builddir)/src/lib/ecore_txt/libecore_txt.la 148$(top_builddir)/src/lib/ecore_txt/libecore_txt.la
151 149
150libecore_x_la_LDFLAGS = -version-info @version_info@
151
152libecore_x_la_DEPENDENCIES = \ 152libecore_x_la_DEPENDENCIES = \
153$(top_builddir)/src/lib/ecore/libecore.la \ 153$(top_builddir)/src/lib/ecore/libecore.la \
154$(top_builddir)/src/lib/ecore_txt/libecore_txt.la 154$(top_builddir)/src/lib/ecore_txt/libecore_txt.la
155 155
156endif 156endif
157 157
158endif
159
158EXTRA_DIST = \ 160EXTRA_DIST = \
159Ecore_X.h \ 161Ecore_X.h \
160Ecore_X_Atoms.h \ 162Ecore_X_Atoms.h \