summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2011-09-29 20:18:58 +0000
committerBoris Faure <billiob@gmail.com>2011-09-29 20:18:58 +0000
commit90a58ac7839697dc6beb58aef0ab520ad2ffc069 (patch)
tree2b7f390c44faa14fe627675dbc1f368a372c9888
parentee46f835bf0efcd69308dd39d54ca71970b0507b (diff)
eenvader: some more autofoo cleanup thx to vtorri
SVN revision: 63673
-rw-r--r--.gitignore32
-rw-r--r--configure.ac8
-rw-r--r--src/Makefile.am6
3 files changed, 39 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index 411d49a..9e7fcd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,35 @@
34/data/Makefile.in 34/data/Makefile.in
35/data/eenvaders.edj 35/data/eenvaders.edj
36/intl 36/intl
37/ABOUT-NLS
38/config.rpath
39/m4/codeset.m4
40/m4/gettext.m4
41/m4/glibc2.m4
42/m4/glibc21.m4
43/m4/iconv.m4
44/m4/intdiv0.m4
45/m4/intl.m4
46/m4/intldir.m4
47/m4/intlmacosx.m4
48/m4/intmax.m4
49/m4/inttypes-pri.m4
50/m4/inttypes_h.m4
51/m4/lcmessage.m4
52/m4/lib-ld.m4
53/m4/lib-link.m4
54/m4/lib-prefix.m4
55/m4/lock.m4
56/m4/longlong.m4
57/m4/nls.m4
58/m4/po.m4
59/m4/printf-posix.m4
60/m4/progtest.m4
61/m4/size_max.m4
62/m4/stdint_h.m4
63/m4/uintmax_t.m4
64/m4/visibility.m4
65/m4/wchar_t.m4
66/m4/wint_t.m4
67/m4/xsize.m4
68/po/
diff --git a/configure.ac b/configure.ac
index d7c11bf..9359dc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,15 +24,15 @@ define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
24AC_PROG_LIBTOOL 24AC_PROG_LIBTOOL
25 25
26m4_ifdef([AM_GNU_GETTEXT_VERSION], [ 26m4_ifdef([AM_GNU_GETTEXT_VERSION], [
27AM_GNU_GETTEXT_VERSION([0.14]) 27AM_GNU_GETTEXT_VERSION([0.17])
28]) 28])
29 29
30PKG_PROG_PKG_CONFIG 30PKG_PROG_PKG_CONFIG
31PKG_CHECK_MODULES([EENVADER], [ecore-evas ecore evas eina]) 31PKG_CHECK_MODULES([EENVADER], [edje ecore-evas ecore evas eina])
32datadir_edj=$(pkg-config --variable=prefix enlightenment)/share/enlightenment/data/backgrounds 32datadir_edj=$($PKG_CONFIG --variable=prefix enlightenment)/share/enlightenment/data/backgrounds
33 33
34EFL_WITH_BIN([edje], [edje-cc], [edje_cc]) 34EFL_WITH_BIN([edje], [edje-cc], [edje_cc])
35vmaj=$(pkg-config --variable=vmaj edje) 35vmaj=$($PKG_CONFIG --variable=vmaj edje)
36MODULE_ARCH="$host_os-$host_cpu-$vmaj.0.0" 36MODULE_ARCH="$host_os-$host_cpu-$vmaj.0.0"
37AC_SUBST(MODULE_ARCH) 37AC_SUBST(MODULE_ARCH)
38AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture") 38AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
diff --git a/src/Makefile.am b/src/Makefile.am
index d44ede3..477406d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
2INCLUDES = -I. \ 2INCLUDES = -I. \
3 -I$(top_srcdir) \ 3 -I$(top_srcdir) \
4 -I$(includedir) \ 4 -I$(includedir) \
5 @EDJE_CFLAGS@ 5 @EENVADER_CFLAGS@
6 6
7 7
8pkgdir = $(datadir)/$(MODULE_ARCH) 8pkgdir = $(datadir)/$(MODULE_ARCH)
@@ -11,7 +11,7 @@ module_la_SOURCES = \
11 eenvaders_evas_smart.c \ 11 eenvaders_evas_smart.c \
12 eenvaders_edje_external.c 12 eenvaders_edje_external.c
13 13
14module_la_LIBADD = @EDJE_LIBS@ 14module_la_LIBADD = @EENVADER_LIBS@
15module_la_LDFLAGS = -module -avoid-version 15module_la_LDFLAGS = -module -avoid-version
16module_la_DEPENDENCIES = $(top_builddir)/config.h 16module_la_DEPENDENCIES = $(top_builddir)/config.h
17 17
@@ -21,7 +21,7 @@ eenvaders_SOURCES = \
21 eenvaders_evas_smart.c \ 21 eenvaders_evas_smart.c \
22 eenvaders.c 22 eenvaders.c
23eenvaders_CPPFLAGS = \ 23eenvaders_CPPFLAGS = \
24 @EENVADER_CFLAGS@ 24 @EENVADER_CFLAGS@
25eenvaders_LDADD = \ 25eenvaders_LDADD = \
26 @EENVADER_LIBS@ 26 @EENVADER_LIBS@
27 27