summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2011-09-29 19:45:23 +0000
committerBoris Faure <billiob@gmail.com>2011-09-29 19:45:23 +0000
commitee46f835bf0efcd69308dd39d54ca71970b0507b (patch)
tree6b8ab94d81fadd39ac9bd2af983ecbc91c89af36
parentd2ea5e363d0da0d966bd7d70524e2477bb0ca6ee (diff)
eenvader: autofoo cleanup thx to vtorri
SVN revision: 63672
-rw-r--r--.gitignore1
-rw-r--r--README1
-rw-r--r--configure.ac23
-rw-r--r--data/Makefile.am2
-rw-r--r--m4/efl_binary.m471
-rw-r--r--src/Makefile.am7
6 files changed, 79 insertions, 26 deletions
diff --git a/.gitignore b/.gitignore
index 6dc762d..411d49a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
33/data/Makefile 33/data/Makefile
34/data/Makefile.in 34/data/Makefile.in
35/data/eenvaders.edj 35/data/eenvaders.edj
36/intl
diff --git a/README b/README
new file mode 100644
index 0000000..20f912c
--- /dev/null
+++ b/README
@@ -0,0 +1 @@
EEnvader.fractal takes inspiration from http://levitated.net/daily/levInvaderFractal.html
diff --git a/configure.ac b/configure.ac
index acd0de4..d7c11bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,33 +27,16 @@ m4_ifdef([AM_GNU_GETTEXT_VERSION], [
27AM_GNU_GETTEXT_VERSION([0.14]) 27AM_GNU_GETTEXT_VERSION([0.14])
28]) 28])
29 29
30PKG_CHECK_MODULES(EINA, [eina]) 30PKG_PROG_PKG_CONFIG
31PKG_CHECK_MODULES(EVAS, [evas]) 31PKG_CHECK_MODULES([EENVADER], [ecore-evas ecore evas eina])
32PKG_CHECK_MODULES(ECORE, [ecore])
33PKG_CHECK_MODULES(ECORE_EVAS, [ecore-evas])
34PKG_CHECK_MODULES(ENLIGHTENMENT, [enlightenment])
35datadir_edj=$(pkg-config --variable=prefix enlightenment)/share/enlightenment/data/backgrounds 32datadir_edj=$(pkg-config --variable=prefix enlightenment)/share/enlightenment/data/backgrounds
36 33
37PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0]) 34EFL_WITH_BIN([edje], [edje-cc], [edje_cc])
38vmaj=$(pkg-config --variable=vmaj edje) 35vmaj=$(pkg-config --variable=vmaj edje)
39MODULE_ARCH="$host_os-$host_cpu-$vmaj.0.0" 36MODULE_ARCH="$host_os-$host_cpu-$vmaj.0.0"
40AC_SUBST(MODULE_ARCH) 37AC_SUBST(MODULE_ARCH)
41AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture") 38AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
42 39
43# Find edje_cc
44AC_ARG_WITH(edje-cc,
45 AC_HELP_STRING([--with-edje-cc=PATH], [specify a specific path to edje_cc]),
46 [
47 v=$withval;
48 EDJE_CC=$v
49 ],[
50 EDJE_CC=$(pkg-config --variable=prefix edje)/bin/edje_cc
51 ]
52)
53AC_SUBST(EDJE_CC)
54AC_MSG_CHECKING([Which edje_cc to use])
55AC_MSG_RESULT(${EDJE_CC})
56
57datadir=$(pkg-config --variable=modules edje)/${PACKAGE} 40datadir=$(pkg-config --variable=modules edje)/${PACKAGE}
58AC_ARG_ENABLE(homedir-install, 41AC_ARG_ENABLE(homedir-install,
59 AS_HELP_STRING([--enable-homedir-install], [Install module in homedir]), 42 AS_HELP_STRING([--enable-homedir-install], [Install module in homedir]),
diff --git a/data/Makefile.am b/data/Makefile.am
index ab7c7b4..098cbd0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -9,7 +9,7 @@ files_DATA = eenvaders.edj
9EXTRA_DIST = eenvaders.edc 9EXTRA_DIST = eenvaders.edc
10 10
11eenvaders.edj: eenvaders.edc 11eenvaders.edj: eenvaders.edc
12 $(EDJE_CC) $(EDJE_FLAGS) $< $@ 12 $(edje_cc) $(EDJE_FLAGS) $< $@
13 13
14clean-local: 14clean-local:
15 rm -rf eenvaders.edj *~ 15 rm -rf eenvaders.edj *~
diff --git a/m4/efl_binary.m4 b/m4/efl_binary.m4
new file mode 100644
index 0000000..c774688
--- /dev/null
+++ b/m4/efl_binary.m4
@@ -0,0 +1,71 @@
1dnl Copyright (C) 2010 Vincent Torri <vtorri at univ-evry dot fr>
2dnl That code is public domain and can be freely used or copied.
3
4dnl Macro that check if a binary is built or not
5
6dnl Usage: EFL_ENABLE_BIN(binary)
7dnl Call AC_SUBST(BINARY_PRG) (BINARY is the uppercase of binary, - being transformed into _)
8dnl Define have_binary (- is transformed into _)
9dnl Define conditional BUILD_BINARY (BINARY is the uppercase of binary, - being transformed into _)
10
11AC_DEFUN([EFL_ENABLE_BIN],
12[
13
14m4_pushdef([UP], m4_translit([[$1]], [-a-z], [_A-Z]))dnl
15m4_pushdef([DOWN], m4_translit([[$1]], [-A-Z], [_a-z]))dnl
16
17have_[]m4_defn([DOWN])="yes"
18
19dnl configure option
20
21AC_ARG_ENABLE([$1],
22 [AC_HELP_STRING([--disable-$1], [disable building of ]DOWN)],
23 [
24 if test "x${enableval}" = "xyes" ; then
25 have_[]m4_defn([DOWN])="yes"
26 else
27 have_[]m4_defn([DOWN])="no"
28 fi
29 ])
30
31AC_MSG_CHECKING([whether to build ]DOWN[ binary])
32AC_MSG_RESULT([$have_[]m4_defn([DOWN])])
33
34if test "x$have_[]m4_defn([DOWN])" = "xyes"; then
35 UP[]_PRG=DOWN[${EXEEXT}]
36fi
37
38AC_SUBST(UP[]_PRG)
39
40AM_CONDITIONAL(BUILD_[]UP, test "x$have_[]m4_defn([DOWN])" = "xyes")
41
42AS_IF([test "x$have_[]m4_defn([DOWN])" = "xyes"], [$2], [$3])
43
44])
45
46
47dnl Macro that check if a binary is built or not
48
49dnl Usage: EFL_WITH_BIN(package, binary, default_value)
50dnl Call AC_SUBST(_binary) (_binary is the lowercase of binary, - being transformed into _ by default, or the value set by the user)
51
52AC_DEFUN([EFL_WITH_BIN],
53[
54
55m4_pushdef([DOWN], m4_translit([[$2]], [-A-Z], [_a-z]))dnl
56
57dnl configure option
58
59AC_ARG_WITH([$2],
60 [AC_HELP_STRING([--with-$2=PATH], [specify a specific path to ]DOWN[ @<:@default=$3@:>@])],
61 [_efl_with_binary=${withval}],
62 [_efl_with_binary=$(pkg-config --variable=prefix $1)/bin/$3])
63
64DOWN=${_efl_with_binary}
65AC_MSG_NOTICE(DOWN[ set to ${_efl_with_binary}])
66
67with_binary_[]m4_defn([DOWN])=${_efl_with_binary}
68
69AC_SUBST(DOWN)
70
71])
diff --git a/src/Makefile.am b/src/Makefile.am
index a444a44..d44ede3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,12 +21,9 @@ eenvaders_SOURCES = \
21 eenvaders_evas_smart.c \ 21 eenvaders_evas_smart.c \
22 eenvaders.c 22 eenvaders.c
23eenvaders_CPPFLAGS = \ 23eenvaders_CPPFLAGS = \
24 @ECORE_EVAS_CFLAGS@ 24 @EENVADER_CFLAGS@
25eenvaders_LDADD = \ 25eenvaders_LDADD = \
26 @EINA_LIBS@ \ 26 @EENVADER_LIBS@
27 @EVAS_LIBS@ \
28 @ECORE_LIBS@ \
29 @ECORE_EVAS_LIBS@
30 27
31clean-local: 28clean-local:
32 rm -rf *~ 29 rm -rf *~