i've already stated that i do not want that, please revert Gustavo : you told me that you wanted to take care of options, no other stuff
Vincent On Wed, Oct 10, 2012 at 7:27 PM, Enlightenment SVN <no-re...@enlightenment.org> wrote: > Log: > efl: eet and eo are now mandatory. > > I've reordered the build to be: eina -> eo -> eet as it make more sense. > > > > Author: barbieri > Date: 2012-10-10 10:27:11 -0700 (Wed, 10 Oct 2012) > New Revision: 77766 > Trac: http://trac.enlightenment.org/e/changeset/77766 > > Modified: > trunk/efl/Makefile.am trunk/efl/configure.ac > trunk/efl/src/benchmarks/Makefile.am trunk/efl/src/bin/Makefile.am > trunk/efl/src/examples/Makefile.am trunk/efl/src/lib/Makefile.am > trunk/efl/src/tests/Makefile.am > > Modified: trunk/efl/Makefile.am > =================================================================== > --- trunk/efl/Makefile.am 2012-10-10 17:06:14 UTC (rev 77765) > +++ trunk/efl/Makefile.am 2012-10-10 17:27:11 UTC (rev 77766) > @@ -57,17 +57,12 @@ > pkgconfig_DATA += pc/evil.pc > endif > > -pkgconfig_DATA += pc/eina.pc > +pkgconfig_DATA += \ > +pc/eina.pc \ > +pc/eo.pc \ > +pc/eet.pc > > -if EFL_BUILD_EET > -pkgconfig_DATA += pc/eet.pc > -endif > > -if EFL_BUILD_EO > -pkgconfig_DATA += pc/eo.pc > -endif > - > - > .PHONY: doc benchmark examples install-examples > > # Documentation > @@ -100,12 +95,8 @@ > if EFL_ENABLE_COVERAGE > @$(MAKE) $(AM_MAKEFLAGS) lcov-reset > endif > -if EFL_BUILD_EET > @./src/tests/eet/eet_suite$(EXEEXT) > -endif > -if EFL_BUILD_EO > @./src/tests/eo/eo_suite$(EXEEXT) > -endif > if EFL_ENABLE_COVERAGE > @$(MAKE) $(AM_MAKEFLAGS) lcov-report > endif > @@ -117,9 +108,7 @@ > benchmark: > @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark > @mkdir benchmark || true > -if EFL_BUILD_EO > @cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s` > -endif > > benchmark-e17: > @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark-e17 > > Modified: trunk/efl/configure.ac > =================================================================== > --- trunk/efl/configure.ac 2012-10-10 17:06:14 UTC (rev 77765) > +++ trunk/efl/configure.ac 2012-10-10 17:27:11 UTC (rev 77766) > @@ -196,8 +196,6 @@ > > #### Additional options to configure > > -EFL_ENABLE_LIB([eet], [yes]) > -EFL_ENABLE_LIB([eo], [yes]) > > > # Assert or fail. > @@ -787,8 +785,6 @@ > > efl_have_eet="no" > > -if test "x${efl_want_build_eet}" = "xyes" ; then > - > AC_MSG_NOTICE([Eet checks]) > > ### Default values > @@ -1136,8 +1132,6 @@ > efl_have_eet="yes" > fi > > -fi > - > #### End of Eet > > > @@ -1145,8 +1139,6 @@ > > efl_have_eo="no" > > -if test "x${efl_want_build_eo}" = "xyes" ; then > - > AC_MSG_NOTICE([Eo checks]) > > ### Default values > @@ -1195,12 +1187,6 @@ > > efl_have_eo="yes" > > -else > - > -AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [false]) > - > -fi > - > #### End of Eo > > > > Modified: trunk/efl/src/benchmarks/Makefile.am > =================================================================== > --- trunk/efl/src/benchmarks/Makefile.am 2012-10-10 17:06:14 UTC (rev > 77765) > +++ trunk/efl/src/benchmarks/Makefile.am 2012-10-10 17:27:11 UTC (rev > 77766) > @@ -6,9 +6,7 @@ > > benchmark: > @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark > -if EFL_BUILD_EO > @$(MAKE) $(AM_MAKEFLAGS) -C eo benchmark > -endif > > benchmark-e17: > @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark-e17 > > Modified: trunk/efl/src/bin/Makefile.am > =================================================================== > --- trunk/efl/src/bin/Makefile.am 2012-10-10 17:06:14 UTC (rev 77765) > +++ trunk/efl/src/bin/Makefile.am 2012-10-10 17:27:11 UTC (rev 77766) > @@ -8,8 +8,4 @@ > > endif > > -if EFL_BUILD_EET > - > SUBDIRS += eet > - > -endif > > Modified: trunk/efl/src/examples/Makefile.am > =================================================================== > --- trunk/efl/src/examples/Makefile.am 2012-10-10 17:06:14 UTC (rev 77765) > +++ trunk/efl/src/examples/Makefile.am 2012-10-10 17:27:11 UTC (rev 77766) > @@ -1,21 +1,13 @@ > MAINTAINERCLEANFILES = Makefile.in > > -SUBDIRS = eina eet eo > +SUBDIRS = eina eo eet > > examples: > @$(MAKE) $(AM_MAKEFLAGS) -C eina examples > -if EFL_BUILD_EET > - @$(MAKE) $(AM_MAKEFLAGS) -C eet examples > -endif > -if EFL_BUILD_EO > @$(MAKE) $(AM_MAKEFLAGS) -C eo examples > -endif > + @$(MAKE) $(AM_MAKEFLAGS) -C eet examples > > install-examples: > @$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples > -if EFL_BUILD_EET > - @$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples > -endif > -if EFL_BUILD_EO > @$(MAKE) $(AM_MAKEFLAGS) -C eo install-examples > -endif > + @$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples > > Modified: trunk/efl/src/lib/Makefile.am > =================================================================== > --- trunk/efl/src/lib/Makefile.am 2012-10-10 17:06:14 UTC (rev 77765) > +++ trunk/efl/src/lib/Makefile.am 2012-10-10 17:27:11 UTC (rev 77766) > @@ -8,16 +8,4 @@ > > endif > > -SUBDIRS += eina > - > -if EFL_BUILD_EET > - > -SUBDIRS += eet > - > -endif > - > -if EFL_BUILD_EO > - > -SUBDIRS += eo > - > -endif > +SUBDIRS += eina eo eet > > Modified: trunk/efl/src/tests/Makefile.am > =================================================================== > --- trunk/efl/src/tests/Makefile.am 2012-10-10 17:06:14 UTC (rev 77765) > +++ trunk/efl/src/tests/Makefile.am 2012-10-10 17:27:11 UTC (rev 77766) > @@ -1,15 +1,3 @@ > MAINTAINERCLEANFILES = Makefile.in > > -SUBDIRS = eina > - > -if EFL_BUILD_EET > - > -SUBDIRS += eet > - > -endif > - > -if EFL_BUILD_EO > - > -SUBDIRS += eo > - > -endif > +SUBDIRS = eina eo eet > > > ------------------------------------------------------------------------------ > Don't let slow site performance ruin your business. Deploy New Relic APM > Deploy New Relic app performance management and know exactly > what is happening inside your Ruby, Python, PHP, Java, and .NET app > Try New Relic at no cost today and get our sweet Data Nerd shirt too! > http://p.sf.net/sfu/newrelic-dev2dev > _______________________________________________ > enlightenment-svn mailing list > enlightenment-...@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn ------------------------------------------------------------------------------ Don't let slow site performance ruin your business. Deploy New Relic APM Deploy New Relic app performance management and know exactly what is happening inside your Ruby, Python, PHP, Java, and .NET app Try New Relic at no cost today and get our sweet Data Nerd shirt too! http://p.sf.net/sfu/newrelic-dev2dev _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
