summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-10-10 17:40:35 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-10-10 17:40:35 +0000
commit22abe85f656a122b198458e62d69ea5b42b3dd2b (patch)
tree0eba395c31ec719553d8e59c87b97606c20d1c77
parent2703b747a36d81a75e373b4a4066bc179717592a (diff)
efl: cleanup to remove stuff that is not in single-tree yet.
Remove every mention to libraries that are still not in the single-tree build such as emotion, efreet and ethumb. Keep it simple and just add them back when they are merged. Added similar variables for all of evil, eina, eo and eet. Keep them in the same order for now. SVN revision: 77767
-rw-r--r--INSTALL9
-rw-r--r--configure.ac124
2 files changed, 23 insertions, 110 deletions
diff --git a/INSTALL b/INSTALL
index 7d1c323bea..a1e89e18ad 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
1Installation Instructions 1Installation Instructions
2************************* 2*************************
3 3
4Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, 4Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
52006, 2007, 2008, 2009 Free Software Foundation, Inc. 5Inc.
6 6
7 Copying and distribution of this file, with or without modification, 7 Copying and distribution of this file, with or without modification,
8are permitted in any medium without royalty provided the copyright 8are permitted in any medium without royalty provided the copyright
@@ -226,6 +226,11 @@ order to use an ANSI C compiler:
226 226
227and if that doesn't work, install pre-built binaries of GCC for HP-UX. 227and if that doesn't work, install pre-built binaries of GCC for HP-UX.
228 228
229 HP-UX `make' updates targets which have the same time stamps as
230their prerequisites, which makes it generally unusable when shipped
231generated files such as `configure' are involved. Use GNU `make'
232instead.
233
229 On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot 234 On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
230parse its `<wchar.h>' header file. The option `-nodtk' can be used as 235parse its `<wchar.h>' header file. The option `-nodtk' can be used as
231a workaround. If GNU CC is not installed, it is therefore recommended 236a workaround. If GNU CC is not installed, it is therefore recommended
diff --git a/configure.ac b/configure.ac
index 0aa9da4628..9407f78b49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,106 +51,36 @@ AC_SUBST([VMAJ])
51 51
52#### Default values 52#### Default values
53 53
54want_evas="yes"
55want_ecore="yes"
56want_embryo="yes"
57want_eio="yes"
58want_edje="yes"
59want_efreet="yes"
60want_e_dbus="yes"
61want_eeze="yes"
62want_emotion="yes"
63want_ethumb="yes"
64want_elementary="yes"
65 54
66requirements_libs_evil="" 55requirements_libs_evil=""
67requirements_libs_eina="" 56requirements_libs_eina=""
57requirements_libs_eo=""
68requirements_libs_eet="" 58requirements_libs_eet=""
69requirements_libs_evas=""
70requirements_libs_ecore=""
71requirements_libs_embryo=""
72requirements_libs_eio=""
73requirements_libs_edje=""
74requirements_libs_efreet=""
75requirements_libs_e_dbus=""
76requirements_libs_eeze=""
77requirements_libs_emotion=""
78requirements_libs_ethumb=""
79requirements_libs_elementary=""
80 59
81requirements_libs_deps_evil="" 60requirements_libs_deps_evil=""
82requirements_libs_deps_eina="" 61requirements_libs_deps_eina=""
62requirements_libs_deps_eo=""
83requirements_libs_deps_eet="" 63requirements_libs_deps_eet=""
84requirements_libs_deps_evas=""
85requirements_libs_deps_ecore=""
86requirements_libs_deps_embryo=""
87requirements_libs_deps_eio=""
88requirements_libs_deps_edje=""
89requirements_libs_deps_efreet=""
90requirements_libs_deps_e_dbus=""
91requirements_libs_deps_eeze=""
92requirements_libs_deps_emotion=""
93requirements_libs_deps_ethumb=""
94requirements_libs_deps_elementary=""
95 64
65requirements_pc_evil=""
96requirements_pc_eina="" 66requirements_pc_eina=""
97requirements_pc_eet=""
98requirements_pc_eo="" 67requirements_pc_eo=""
99requirements_pc_evas="" 68requirements_pc_eet=""
100requirements_pc_ecore=""
101requirements_pc_embryo=""
102requirements_pc_eio=""
103requirements_pc_edje=""
104requirements_pc_efreet=""
105requirements_pc_e_dbus=""
106requirements_pc_eeze=""
107requirements_pc_emotion=""
108requirements_pc_ethumb=""
109requirements_pc_elementary=""
110 69
70requirements_pc_deps_evil=""
111requirements_pc_deps_eina="" 71requirements_pc_deps_eina=""
72requirements_pc_deps_eo=""
112requirements_pc_deps_eet="" 73requirements_pc_deps_eet=""
113requirements_pc_deps_evas=""
114requirements_pc_deps_ecore=""
115requirements_pc_deps_embryo=""
116requirements_pc_deps_eio=""
117requirements_pc_deps_edje=""
118requirements_pc_deps_efreet=""
119requirements_pc_deps_e_dbus=""
120requirements_pc_deps_eeze=""
121requirements_pc_deps_emotion=""
122requirements_pc_deps_ethumb=""
123requirements_pc_deps_elementary=""
124 74
125AC_SUBST([requirements_libs_evil]) 75AC_SUBST([requirements_libs_evil])
126AC_SUBST([requirements_libs_eina]) 76AC_SUBST([requirements_libs_eina])
77AC_SUBST([requirements_libs_eo])
127AC_SUBST([requirements_libs_eet]) 78AC_SUBST([requirements_libs_eet])
128AC_SUBST([requirements_libs_evas])
129AC_SUBST([requirements_libs_ecore])
130AC_SUBST([requirements_libs_embryo])
131AC_SUBST([requirements_libs_eio])
132AC_SUBST([requirements_libs_edje])
133AC_SUBST([requirements_libs_efreet])
134AC_SUBST([requirements_libs_e_dbus])
135AC_SUBST([requirements_libs_eeze])
136AC_SUBST([requirements_libs_emotion])
137AC_SUBST([requirements_libs_ethumb])
138AC_SUBST([requirements_libs_elementary])
139 79
80AC_SUBST([requirements_pc_evil])
140AC_SUBST([requirements_pc_eina]) 81AC_SUBST([requirements_pc_eina])
141AC_SUBST([requirements_pc_eet])
142AC_SUBST([requirements_pc_eo]) 82AC_SUBST([requirements_pc_eo])
143AC_SUBST([requirements_pc_evas]) 83AC_SUBST([requirements_pc_eet])
144AC_SUBST([requirements_pc_ecore])
145AC_SUBST([requirements_pc_embryo])
146AC_SUBST([requirements_pc_eio])
147AC_SUBST([requirements_pc_edje])
148AC_SUBST([requirements_pc_efreet])
149AC_SUBST([requirements_pc_e_dbus])
150AC_SUBST([requirements_pc_eeze])
151AC_SUBST([requirements_pc_emotion])
152AC_SUBST([requirements_pc_ethumb])
153AC_SUBST([requirements_pc_elementary])
154 84
155 85
156AC_CANONICAL_HOST 86AC_CANONICAL_HOST
@@ -165,18 +95,12 @@ case "$host_os" in
165 mingw32ce*) 95 mingw32ce*)
166 have_wince="yes" 96 have_wince="yes"
167 have_windows="yes" 97 have_windows="yes"
168 want_efreet="no"
169 want_e_dbus="no"
170 want_eeze="no"
171 want_emotion="no"
172 want_ethumb="no"
173 MODULE_ARCH="$host_os-$host_cpu" 98 MODULE_ARCH="$host_os-$host_cpu"
174 MODULE_EXT=".dll" 99 MODULE_EXT=".dll"
175 ;; 100 ;;
176 mingw*) 101 mingw*)
177 have_win32="yes" 102 have_win32="yes"
178 have_windows="yes" 103 have_windows="yes"
179 want_eeze="no"
180 MODULE_ARCH="$host_os-$host_cpu-v_maj.v_min.v_mic" 104 MODULE_ARCH="$host_os-$host_cpu-v_maj.v_min.v_mic"
181 MODULE_EXT=".dll" 105 MODULE_EXT=".dll"
182 ;; 106 ;;
@@ -626,10 +550,11 @@ fi
626 550
627## Examples 551## Examples
628 552
629PKG_CHECK_MODULES([ECORE_EVAS], 553# TODO: add once ecore-evas is merged:
630 [ecore-evas ecore evas], 554#PKG_CHECK_MODULES([ECORE_EVAS],
631 [build_tiler_example="yes"], 555# [ecore-evas ecore evas],
632 [build_tiler_example="no"]) 556# [build_tiler_example="yes"],
557# [build_tiler_example="no"])
633 558
634AM_CONDITIONAL([BUILD_TILER_EXAMPLE], [test "x${build_tiler_example}" = "xyes"]) 559AM_CONDITIONAL([BUILD_TILER_EXAMPLE], [test "x${build_tiler_example}" = "xyes"])
635 560
@@ -1160,7 +1085,8 @@ AC_SUBST([EO_LIBS])
1160 1085
1161# Example (evas one) 1086# Example (evas one)
1162 1087
1163PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"]) 1088# TODO: add once elementary is merged
1089#PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"])
1164AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"]) 1090AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"])
1165 1091
1166### Checks for header files 1092### Checks for header files
@@ -1190,24 +1116,6 @@ efl_have_eo="yes"
1190#### End of Eo 1116#### End of Eo
1191 1117
1192 1118
1193#### Evas
1194
1195#AC_MSG_NOTICE([Evas checks])
1196
1197### Default values
1198### Additional options to configure
1199### Checks for programs
1200### Checks for libraries
1201### Checks for header files
1202### Checks for types
1203### Checks for structures
1204### Checks for compiler characteristics
1205### Checks for linker characteristics
1206### Checks for library functions
1207
1208#### End of Evas
1209
1210
1211AC_CONFIG_FILES([ 1119AC_CONFIG_FILES([
1212Makefile 1120Makefile
1213doc/Makefile 1121doc/Makefile