2011/12/28 Vincent Torri <vincent.to...@gmail.com>: > On Wed, Dec 28, 2011 at 3:13 PM, Enlightenment SVN > <no-re...@enlightenment.org> wrote: >> Log: >> Don't override standard variables, it looks weird. In turn, fix building >> with automake 1.11.2 >> >> >> Author: sachiel >> Date: 2011-12-28 06:13:30 -0800 (Wed, 28 Dec 2011) >> New Revision: 66599 >> Trac: http://trac.enlightenment.org/e/changeset/66599 >> >> Modified: >> trunk/ecore/src/examples/Makefile.am trunk/edje/src/examples/Makefile.am >> trunk/eet/src/examples/Makefile.am trunk/eina/src/examples/Makefile.am >> trunk/elementary/src/examples/Makefile.am >> trunk/emotion/src/examples/Makefile.am trunk/evas/src/examples/Makefile.am >> >> Modified: trunk/ecore/src/examples/Makefile.am >> =================================================================== >> --- trunk/ecore/src/examples/Makefile.am 2011-12-28 12:54:59 UTC (rev >> 66598) >> +++ trunk/ecore/src/examples/Makefile.am 2011-12-28 14:13:30 UTC (rev >> 66599) >> @@ -1,6 +1,6 @@ >> MAINTAINERCLEANFILES = Makefile.in >> >> -pkglibdir = $(datadir)/$(PACKAGE)/examples >> +examplesdir = $(datadir)/$(PACKAGE)/examples > > $(pkgdatadir) is maybe better than $(datadir)/$(PACKAGE) >
The worst part is that I thought of it while doing it and completely ignored it. Will change later. > Vincent > >> >> filesdir = $(datadir)/$(PACKAGE)/examples >> files_DATA = >> @@ -59,7 +59,7 @@ >> EXTRA_DIST = $(SRCS) \ >> $(srcdir)/red.png >> >> -pkglib_PROGRAMS = >> +examples_PROGRAMS = >> >> if EFL_INSTALL_EXAMPLES >> files_DATA += $(SRCS) \ >> @@ -67,7 +67,7 @@ >> endif >> >> if EFL_BUILD_EXAMPLES >> -pkglib_PROGRAMS += \ >> +examples_PROGRAMS += \ >> ecore_animator_example \ >> ecore_fd_handler_example \ >> ecore_poller_example \ >> >> Modified: trunk/edje/src/examples/Makefile.am >> =================================================================== >> --- trunk/edje/src/examples/Makefile.am 2011-12-28 12:54:59 UTC (rev 66598) >> +++ trunk/edje/src/examples/Makefile.am 2011-12-28 14:13:30 UTC (rev 66599) >> @@ -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 @@ >> >> files_DATA += $(EDJS) >> >> -pkglib_PROGRAMS = \ >> +examples_PROGRAMS = \ >> edje-basic \ >> edje-swallow \ >> edje-text \ >> >> Modified: trunk/eet/src/examples/Makefile.am >> =================================================================== >> --- trunk/eet/src/examples/Makefile.am 2011-12-28 12:54:59 UTC (rev 66598) >> +++ trunk/eet/src/examples/Makefile.am 2011-12-28 14:13:30 UTC (rev 66599) >> @@ -1,6 +1,6 @@ >> MAINTAINERCLEANFILES = Makefile.in >> >> -pkglibdir = $(datadir)/$(PACKAGE)/examples >> +examplesdir = $(datadir)/$(PACKAGE)/examples >> >> if BUILD_EXAMPLES >> AM_CPPFLAGS = \ >> @@ -8,7 +8,7 @@ >> -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@ >> >> Modified: trunk/eina/src/examples/Makefile.am >> =================================================================== >> --- trunk/eina/src/examples/Makefile.am 2011-12-28 12:54:59 UTC (rev 66598) >> +++ trunk/eina/src/examples/Makefile.am 2011-12-28 14:13:30 UTC (rev 66599) >> @@ -1,6 +1,6 @@ >> MAINTAINERCLEANFILES = Makefile.in >> >> -pkglibdir = $(datadir)/$(PACKAGE)/examples >> +examplesdir = $(datadir)/$(PACKAGE)/examples >> >> AM_CPPFLAGS = \ >> -I. \ >> @@ -39,7 +39,7 @@ >> eina_strbuf_01.c \ >> eina_tiler_01.c >> >> -pkglib_PROGRAMS = >> +examples_PROGRAMS = >> >> if EFL_INSTALL_EXAMPLES >> filesdir = $(datadir)/$(PACKAGE)/examples >> @@ -47,7 +47,7 @@ >> endif >> >> if EFL_BUILD_EXAMPLES >> -pkglib_PROGRAMS += \ >> +examples_PROGRAMS += \ >> eina_accessor_01 \ >> eina_array_01 \ >> eina_array_02 \ >> @@ -77,7 +77,7 @@ >> >> 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 >> >> >> Modified: trunk/elementary/src/examples/Makefile.am >> =================================================================== >> --- trunk/elementary/src/examples/Makefile.am 2011-12-28 12:54:59 UTC (rev >> 66598) >> +++ trunk/elementary/src/examples/Makefile.am 2011-12-28 14:13:30 UTC (rev >> 66599) >> @@ -2,7 +2,7 @@ >> >> .PHONY: screenshots >> >> -pkglibdir = $(datadir)/$(PACKAGE)/examples >> +examplesdir = $(datadir)/$(PACKAGE)/examples >> filesdir = $(datadir)/$(PACKAGE)/examples >> files_DATA = >> >> @@ -124,7 +124,7 @@ >> efl_thread_5.c \ >> efl_thread_6.c >> >> -pkglib_PROGRAMS = >> +examples_PROGRAMS = >> >> .edc.edj: >> $(EDJE_CC) $(EDJE_FLAGS) $< $@ >> @@ -142,7 +142,7 @@ >> clean-local: >> rm -f *.edj >> >> -pkglib_PROGRAMS += \ >> +examples_PROGRAMS += \ >> actionslider_example_01 \ >> anchorblock_example_01 \ >> bubble_example_01 \ >> >> Modified: trunk/emotion/src/examples/Makefile.am >> =================================================================== >> --- trunk/emotion/src/examples/Makefile.am 2011-12-28 12:54:59 UTC (rev >> 66598) >> +++ trunk/emotion/src/examples/Makefile.am 2011-12-28 14:13:30 UTC (rev >> 66599) >> @@ -1,6 +1,6 @@ >> MAINTAINERCLEANFILES = Makefile.in >> >> -pkglibdir = $(datadir)/$(PACKAGE)/examples >> +examplesdir = $(datadir)/$(PACKAGE)/examples >> >> AM_CPPFLAGS = \ >> -I. \ >> @@ -22,7 +22,7 @@ >> >> EXTRA_DIST = $(SRCS) >> >> -pkglib_PROGRAMS = >> +examples_PROGRAMS = >> >> if EFL_INSTALL_EXAMPLES >> filesdir = $(datadir)/$(PACKAGE)/examples >> @@ -30,7 +30,7 @@ >> endif >> >> if EFL_BUILD_EXAMPLES >> -pkglib_PROGRAMS += \ >> +examples_PROGRAMS += \ >> emotion_basic_example \ >> emotion_generic_example \ >> emotion_border_example \ >> >> Modified: trunk/evas/src/examples/Makefile.am >> =================================================================== >> --- trunk/evas/src/examples/Makefile.am 2011-12-28 12:54:59 UTC (rev 66598) >> +++ trunk/evas/src/examples/Makefile.am 2011-12-28 14:13:30 UTC (rev 66599) >> @@ -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_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@ >> >> >> >> ------------------------------------------------------------------------------ >> Write once. Port to many. >> Get the SDK and tools to simplify cross-platform app development. Create >> new or port existing apps to sell to consumers worldwide. Explore the >> Intel AppUpSM program developer opportunity. appdeveloper.intel.com/join >> http://p.sf.net/sfu/intel-appdev >> _______________________________________________ >> enlightenment-svn mailing list >> enlightenment-...@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > > ------------------------------------------------------------------------------ > Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex > infrastructure or vast IT resources to deliver seamless, secure access to > virtual desktops. With this all-in-one solution, easily deploy virtual > desktops for less than the cost of PCs and save 60% on VDI infrastructure > costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox > _______________________________________________ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel ------------------------------------------------------------------------------ Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex infrastructure or vast IT resources to deliver seamless, secure access to virtual desktops. With this all-in-one solution, easily deploy virtual desktops for less than the cost of PCs and save 60% on VDI infrastructure costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
