summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-12-05 18:10:43 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-12-05 18:10:43 +0000
commit1a2daa057d5872d3c587791fe2f7c6bb86bbc202 (patch)
tree28ddb92ef4b8b3ec4ad1de30aec3155977fa7be1
parent8ea3c291325cf77bd2a54172778e65912525e11a (diff)
add eio example and fix ecore_fb linking
SVN revision: 80273
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile_Ecore_FB.am1
-rw-r--r--src/examples/Makefile.am4
-rw-r--r--src/examples/eio/Makefile.am40
-rw-r--r--src/examples/eio/eio_file_ls.c (renamed from legacy/eio/src/examples/eio_file_ls.c)0
5 files changed, 45 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 241b69e..6c10144 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4123,6 +4123,7 @@ src/examples/eet/Makefile
4123src/examples/eo/Makefile 4123src/examples/eo/Makefile
4124src/examples/evas/Makefile 4124src/examples/evas/Makefile
4125src/examples/ecore/Makefile 4125src/examples/ecore/Makefile
4126src/examples/eio/Makefile
4126src/lib/eina/eina_config.h 4127src/lib/eina/eina_config.h
4127spec/efl.spec 4128spec/efl.spec
4128pc/evil.pc 4129pc/evil.pc
diff --git a/src/Makefile_Ecore_FB.am b/src/Makefile_Ecore_FB.am
index adcc5eb..97748f8 100644
--- a/src/Makefile_Ecore_FB.am
+++ b/src/Makefile_Ecore_FB.am
@@ -34,6 +34,7 @@ lib_ecore_fb_libecore_fb_la_CPPFLAGS = \
34@ECORE_FB_CFLAGS@ 34@ECORE_FB_CFLAGS@
35 35
36lib_ecore_fb_libecore_fb_la_LIBADD = \ 36lib_ecore_fb_libecore_fb_la_LIBADD = \
37lib/ecore_input/libecore_input.la \
37lib/ecore/libecore.la \ 38lib/ecore/libecore.la \
38lib/eo/libeo.la \ 39lib/eo/libeo.la \
39lib/eina/libeina.la \ 40lib/eina/libeina.la \
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 0203930..da0ba7d 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -1,6 +1,6 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3SUBDIRS = eina eo eet evas ecore 3SUBDIRS = eina eo eet evas ecore eio
4 4
5examples: 5examples:
6 @$(MAKE) $(AM_MAKEFLAGS) -C eina examples 6 @$(MAKE) $(AM_MAKEFLAGS) -C eina examples
@@ -8,6 +8,7 @@ examples:
8 @$(MAKE) $(AM_MAKEFLAGS) -C eet examples 8 @$(MAKE) $(AM_MAKEFLAGS) -C eet examples
9 @$(MAKE) $(AM_MAKEFLAGS) -C evas examples 9 @$(MAKE) $(AM_MAKEFLAGS) -C evas examples
10 @$(MAKE) $(AM_MAKEFLAGS) -C ecore examples 10 @$(MAKE) $(AM_MAKEFLAGS) -C ecore examples
11 @$(MAKE) $(AM_MAKEFLAGS) -C eio examples
11 12
12install-examples: 13install-examples:
13 @$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples 14 @$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples
@@ -15,3 +16,4 @@ install-examples:
15 @$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples 16 @$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples
16 @$(MAKE) $(AM_MAKEFLAGS) -C evas install-examples 17 @$(MAKE) $(AM_MAKEFLAGS) -C evas install-examples
17 @$(MAKE) $(AM_MAKEFLAGS) -C ecore install-examples 18 @$(MAKE) $(AM_MAKEFLAGS) -C ecore install-examples
19 @$(MAKE) $(AM_MAKEFLAGS) -C eio install-examples
diff --git a/src/examples/eio/Makefile.am b/src/examples/eio/Makefile.am
new file mode 100644
index 0000000..bd34825
--- /dev/null
+++ b/src/examples/eio/Makefile.am
@@ -0,0 +1,40 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3AM_CPPFLAGS = \
4-I$(top_srcdir)/src/lib/eina \
5-I$(top_srcdir)/src/lib/eo \
6-I$(top_srcdir)/src/lib/eet \
7-I$(top_srcdir)/src/lib/ecore \
8-I$(top_srcdir)/src/lib/eio \
9-I$(top_builddir)/src/lib/eina \
10-I$(top_builddir)/src/lib/eo \
11-I$(top_builddir)/src/lib/eet \
12-I$(top_builddir)/src/lib/ecore \
13-I$(top_builddir)/src/lib/eio
14
15EXTRA_PROGRAMS = eio_file_ls
16
17eio_file_ls_SOURCES = eio_file_ls.c
18eio_file_ls_LDADD = \
19$(top_builddir)/src/lib/eio/libeio.la \
20$(top_builddir)/src/lib/ecore/libecore.la \
21$(top_builddir)/src/lib/eet/libeet.la \
22$(top_builddir)/src/lib/eina/libeina.la \
23@EIO_LIBS@
24
25SRCS = \
26eio_file_ls
27
28examples: $(EXTRA_PROGRAMS)
29
30clean-local:
31 rm -f $(EXTRA_PROGRAMS)
32
33install-examples:
34 mkdir -p $(datadir)/eio/examples
35 $(install_sh_DATA) -c $(SRCS) $(datadir)/eio/examples
36
37uninstall-local:
38 for f in $(SRCS) ; do \
39 rm -f $(datadir)/io/examples/$$f ; \
40 done
diff --git a/legacy/eio/src/examples/eio_file_ls.c b/src/examples/eio/eio_file_ls.c
index 7a9e7f5..7a9e7f5 100644
--- a/legacy/eio/src/examples/eio_file_ls.c
+++ b/src/examples/eio/eio_file_ls.c