From b9965c44061c166ce33099068455202d6b6d814f Mon Sep 17 00:00:00 2001 From: sachiel Date: Wed, 28 Dec 2011 14:13:30 +0000 Subject: [PATCH] Don't override standard variables, it looks weird. In turn, fix building with automake 1.11.2 git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@66599 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/examples/Makefile.am | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am index f748c12..ffa9274 100644 --- a/src/examples/Makefile.am +++ b/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@ -- 2.7.4