Don't override standard variables, it looks weird. In turn, fix building with automak...

SVN revision: 66599

diff --git a/legacy/ecore/src/examples/Makefile.am b/legacy/ecore/src/examples/Makefile.am
index 63748a5..afb6f40 100644 (file)
--- a/legacy/ecore/src/examples/Makefile.am
+++ b/legacy/ecore/src/examples/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-pkglibdir = $(datadir)/$(PACKAGE)/examples
+examplesdir = $(datadir)/$(PACKAGE)/examples
 
 filesdir = $(datadir)/$(PACKAGE)/examples
 files_DATA =
@@ -59,7 +59,7 @@ SRCS = \
 EXTRA_DIST = $(SRCS) \
        $(srcdir)/red.png
 
-pkglib_PROGRAMS =
+examples_PROGRAMS =
 
 if EFL_INSTALL_EXAMPLES
 files_DATA += $(SRCS) \
@@ -67,7 +67,7 @@ files_DATA += $(SRCS) \
 endif
 
 if EFL_BUILD_EXAMPLES
-pkglib_PROGRAMS += \
+examples_PROGRAMS += \
        ecore_animator_example \
        ecore_fd_handler_example \
        ecore_poller_example \

diff --git a/legacy/edje/src/examples/Makefile.am b/legacy/edje/src/examples/Makefile.am
index 19a6774..579f148 100644 (file)
--- a/legacy/edje/src/examples/Makefile.am
+++ b/legacy/edje/src/examples/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-pkglibdir = $(datadir)/$(PACKAGE)/examples
+examplesdir = $(datadir)/$(PACKAGE)/examples
 
 if ENABLE_MULTISENSE
 MULTISENSE_EDC_FILE = multisense.edc
@@ -64,7 +64,7 @@ AM_CPPFLAGS = \
 
 files_DATA += $(EDJS)
 
-pkglib_PROGRAMS = \
+examples_PROGRAMS = \
        edje-basic \
        edje-swallow \
        edje-text \

diff --git a/legacy/eet/src/examples/Makefile.am b/legacy/eet/src/examples/Makefile.am
index 8279445..6c5a324 100644 (file)
--- a/legacy/eet/src/examples/Makefile.am
+++ b/legacy/eet/src/examples/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-pkglibdir = $(datadir)/$(PACKAGE)/examples
+examplesdir = $(datadir)/$(PACKAGE)/examples
 
 if BUILD_EXAMPLES
 AM_CPPFLAGS = \
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 @EINA_CFLAGS@
 
-pkglib_PROGRAMS = eet_basic eet_file eet_data_simple eet_data_nested eet_data_file_descriptor_01 eet_data_file_descriptor_02 eet_data_cipher_decipher
+examples_PROGRAMS = eet_basic eet_file eet_data_simple eet_data_nested eet_data_file_descriptor_01 eet_data_file_descriptor_02 eet_data_cipher_decipher
 
 eet_basic_SOURCES = eet-basic.c
 eet_basic_LDADD = $(top_builddir)/src/lib/libeet.la @EINA_LIBS@

diff --git a/legacy/eina/src/examples/Makefile.am b/legacy/eina/src/examples/Makefile.am
index f81667c..45b72f0 100644 (file)
--- a/legacy/eina/src/examples/Makefile.am
+++ b/legacy/eina/src/examples/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-pkglibdir = $(datadir)/$(PACKAGE)/examples
+examplesdir = $(datadir)/$(PACKAGE)/examples
 
 AM_CPPFLAGS = \
 -I. \
@@ -39,7 +39,7 @@ SRCS = \
        eina_strbuf_01.c \
        eina_tiler_01.c
 
-pkglib_PROGRAMS =
+examples_PROGRAMS =
 
 if EFL_INSTALL_EXAMPLES
 filesdir = $(datadir)/$(PACKAGE)/examples
@@ -47,7 +47,7 @@ files_DATA = $(SRCS)
 endif
 
 if EFL_BUILD_EXAMPLES
-pkglib_PROGRAMS += \
+examples_PROGRAMS += \
        eina_accessor_01 \
        eina_array_01 \
        eina_array_02 \
@@ -77,7 +77,7 @@ pkglib_PROGRAMS += \
 
 if BUILD_TILER_EXAMPLE
 AM_CPPFLAGS += @ECORE_EVAS_CFLAGS@
-pkglib_PROGRAMS += eina_tiler_01
+examples_PROGRAMS += eina_tiler_01
 eina_tiler_01_LDADD = $(top_builddir)/src/lib/libeina.la @ECORE_EVAS_LIBS@
 endif
 

diff --git a/legacy/emotion/src/examples/Makefile.am b/legacy/emotion/src/examples/Makefile.am
index 15c7ef8..7476f08 100644 (file)
--- a/legacy/emotion/src/examples/Makefile.am
+++ b/legacy/emotion/src/examples/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-pkglibdir = $(datadir)/$(PACKAGE)/examples
+examplesdir = $(datadir)/$(PACKAGE)/examples
 
 AM_CPPFLAGS = \
 -I. \
@@ -22,7 +22,7 @@ SRCS = \
 
 EXTRA_DIST = $(SRCS)
 
-pkglib_PROGRAMS =
+examples_PROGRAMS =
 
 if EFL_INSTALL_EXAMPLES
 filesdir = $(datadir)/$(PACKAGE)/examples
@@ -30,7 +30,7 @@ files_DATA = $(SRCS)
 endif
 
 if EFL_BUILD_EXAMPLES
-pkglib_PROGRAMS += \
+examples_PROGRAMS += \
        emotion_basic_example \
        emotion_generic_example \
        emotion_border_example \

diff --git a/legacy/evas/src/examples/Makefile.am b/legacy/evas/src/examples/Makefile.am
index f748c12..ffa9274 100644 (file)
--- a/legacy/evas/src/examples/Makefile.am
+++ b/legacy/evas/src/examples/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-pkglibdir = $(datadir)/$(PACKAGE)/examples
+examplesdir = $(datadir)/$(PACKAGE)/examples
 
 #put here all EDCs one needs to the tests
 EDCS = aspect.edc
@@ -28,68 +28,68 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = @WIN32_CFLAGS@
 
-pkglib_PROGRAMS =
+examples_PROGRAMS =
 
 if BUILD_ENGINE_BUFFER
 AM_CPPFLAGS += -I$(top_srcdir)/src/modules/engines/buffer
 
-pkglib_PROGRAMS += evas_buffer_simple
+examples_PROGRAMS += evas_buffer_simple
 evas_buffer_simple_SOURCES = evas-buffer-simple.c
 evas_buffer_simple_LDADD = $(top_builddir)/src/lib/libevas.la
 endif
 
-pkglib_PROGRAMS += evas_init_shutdown
+examples_PROGRAMS += evas_init_shutdown
 evas_init_shutdown_SOURCES = evas-init-shutdown.c
 evas_init_shutdown_LDADD = $(top_builddir)/src/lib/libevas.la
 
 #the ones using ecore_evas follow
 AM_CPPFLAGS += @ECORE_EVAS_CFLAGS@
 
-pkglib_PROGRAMS += evas_images
+examples_PROGRAMS += evas_images
 evas_images_SOURCES = evas-images.c
 evas_images_LDADD = $(top_builddir)/src/lib/libevas.la @ECORE_EVAS_LIBS@
 
-pkglib_PROGRAMS += evas_events
+examples_PROGRAMS += evas_events
 evas_events_SOURCES = evas-events.c
 evas_events_LDADD = $(top_builddir)/src/lib/libevas.la @ECORE_EVAS_LIBS@
 
-pkglib_PROGRAMS += evas_object_manipulation
+examples_PROGRAMS += evas_object_manipulation
 evas_object_manipulation_SOURCES = evas-object-manipulation.c
 evas_object_manipulation_LDADD = $(top_builddir)/src/lib/libevas.la @ECORE_EVAS_LIBS@
 
-pkglib_PROGRAMS += evas_hints
+examples_PROGRAMS += evas_hints
 evas_hints_SOURCES = evas-hints.c
 evas_hints_LDADD = $(top_builddir)/src/lib/libevas.la @ECORE_EVAS_LIBS@
 
-pkglib_PROGRAMS += evas_stacking
+examples_PROGRAMS += evas_stacking
 evas_stacking_SOURCES = evas-stacking.c
 evas_stacking_LDADD = $(top_builddir)/src/lib/libevas.la @ECORE_EVAS_LIBS@
 
-pkglib_PROGRAMS += evas_images2
+examples_PROGRAMS += evas_images2
 evas_images2_SOURCES = evas-images2.c
 evas_images2_LDADD = $(top_builddir)/src/lib/libevas.la @ECORE_EVAS_LIBS@
 
-pkglib_PROGRAMS += evas_text
+examples_PROGRAMS += evas_text
 evas_text_SOURCES = evas-text.c
 evas_text_LDADD = $(top_builddir)/src/lib/libevas.la @ECORE_EVAS_LIBS@
 
-pkglib_PROGRAMS += evas_smart_object
+examples_PROGRAMS += evas_smart_object
 evas_smart_object_SOURCES = evas-smart-object.c
 evas_smart_object_LDADD = $(top_builddir)/src/lib/libevas.la @ECORE_EVAS_LIBS@
 
-pkglib_PROGRAMS += evas_box
+examples_PROGRAMS += evas_box
 evas_box_SOURCES = evas-box.c
 evas_box_LDADD = $(top_builddir)/src/lib/libevas.la @ECORE_EVAS_LIBS@ @EINA_LIBS@
 
 #the ones using ecore_evas and edje follow
 AM_CPPFLAGS += @EDJE_CFLAGS@
 
-pkglib_PROGRAMS += evas_aspect_hints
+examples_PROGRAMS += evas_aspect_hints
 evas_aspect_hints_DEPS = $(srcdir)/aspect.edc
 evas_aspect_hints_SOURCES = evas-aspect-hints.c
 evas_aspect_hints_LDADD = $(top_builddir)/src/lib/libevas.la @ECORE_EVAS_LIBS@ @EDJE_LIBS@
 
-pkglib_PROGRAMS += evas_map_utils
+examples_PROGRAMS += evas_map_utils
 evas_map_utils_SOURCES = evas-map-utils.c
 evas_map_utils_LDADD = $(top_builddir)/src/lib/libevas.la @ECORE_EVAS_LIBS@