by doing that, you forbid automake to rebuild all the libs depending on evil if evil has changed... If i have done what I did, there was a reason...
Vincent On Thu, Dec 20, 2012 at 8:25 PM, Enlightenment SVN <no-re...@enlightenment.org> wrote: > Log: > efl: simplify linkage/usage of evil on windows. > > instead of spreading it all around, just define 2 AC_SUBST() that will > do the work. > > > > Author: barbieri > Date: 2012-12-20 11:25:51 -0800 (Thu, 20 Dec 2012) > New Revision: 81477 > Trac: http://trac.enlightenment.org/e/changeset/81477 > > Modified: > trunk/efl/configure.ac trunk/efl/src/Makefile_Ecore.am > trunk/efl/src/Makefile_Ecore_Con.am trunk/efl/src/Makefile_Ecore_Evas.am > trunk/efl/src/Makefile_Eet.am trunk/efl/src/Makefile_Eina.am > trunk/efl/src/Makefile_Embryo.am trunk/efl/src/Makefile_Eo.am > trunk/efl/src/Makefile_Evas.am trunk/efl/src/Makefile_Evil.am > > Modified: trunk/efl/configure.ac > =================================================================== > --- trunk/efl/configure.ac 2012-12-20 19:02:42 UTC (rev 81476) > +++ trunk/efl/configure.ac 2012-12-20 19:25:51 UTC (rev 81477) > @@ -677,9 +677,14 @@ > > ###################### EFL ###################### > > +#### Platform-dependent > +DL_LIBS="" > > #### Evil > > +USE_EVIL_CFLAGS="" > +USE_EVIL_LIBS="" > + > if test "x${have_windows}" = "xyes" ; then > > AC_MSG_NOTICE([Evil checks]) > @@ -747,8 +752,14 @@ > fi > platform_libs="${platform_libs} ${platform_libs_evil}" > > +USE_EVIL_CFLAGS="-I\$(top_srcdir)/src/lib/evil" > +USE_EVIL_LIBS="lib/evil/libevil.la" > +DL_LIBS="lib/evil/libdl.la" > fi > > +AC_SUBST([USE_EVIL_CFLAGS]) > +AC_SUBST([USE_EVIL_LIBS]) > + > #### End of Evil > > > @@ -789,7 +800,10 @@ > > #### End of Escape > > +AC_SUBST([DL_LIBS]) > +#### End of Platform-dependent > > + > #### Eina > > AC_MSG_NOTICE([Eina checks]) > > Modified: trunk/efl/src/Makefile_Ecore.am > =================================================================== > --- trunk/efl/src/Makefile_Ecore.am 2012-12-20 19:02:42 UTC (rev 81476) > +++ trunk/efl/src/Makefile_Ecore.am 2012-12-20 19:25:51 UTC (rev 81477) > @@ -55,13 +55,9 @@ > -DEFL_ECORE_BUILD \ > @EFL_CFLAGS@ \ > @EFL_COV_CFLAGS@ \ > -@ECORE_CFLAGS@ > +@ECORE_CFLAGS@ \ > +@USE_EVIL_CFLAGS@ > > -if HAVE_WINDOWS > -lib_ecore_libecore_la_CPPFLAGS += \ > --I$(top_srcdir)/src/lib/evil > -endif > - > if HAVE_PS3 > lib_ecore_libecore_la_CPPFLAGS += \ > -I$(top_srcdir)/src/lib/escape > @@ -69,12 +65,9 @@ > > lib_ecore_libecore_la_LIBADD = \ > lib/eo/libeo.la \ > -lib/eina/libeina.la > +lib/eina/libeina.la \ > +@USE_EVIL_LIBS@ > > -if HAVE_WINDOWS > -lib_ecore_libecore_la_LIBADD += lib/evil/libevil.la > -endif > - > if HAVE_PS3 > lib_ecore_libecore_la_LIBADD += lib/escape/libescape.la > endif > > Modified: trunk/efl/src/Makefile_Ecore_Con.am > =================================================================== > --- trunk/efl/src/Makefile_Ecore_Con.am 2012-12-20 19:02:42 UTC (rev 81476) > +++ trunk/efl/src/Makefile_Ecore_Con.am 2012-12-20 19:25:51 UTC (rev 81477) > @@ -43,23 +43,16 @@ > -DEFL_ECORE_CON_BUILD \ > @EFL_CFLAGS@ \ > @EFL_COV_CFLAGS@ \ > -@ECORE_CON_CFLAGS@ > +@ECORE_CON_CFLAGS@ \ > +@USE_EVIL_CFLAGS@ > > -if HAVE_WINDOWS > -lib_ecore_con_libecore_con_la_CPPFLAGS += \ > --I$(top_srcdir)/src/lib/evil > -endif > - > lib_ecore_con_libecore_con_la_LIBADD = \ > lib/ecore/libecore.la \ > lib/eet/libeet.la \ > lib/eo/libeo.la \ > -lib/eina/libeina.la > +lib/eina/libeina.la \ > +@USE_EVIL_LIBS@ > > -if HAVE_WINDOWS > -lib_ecore_con_libecore_con_la_LIBADD += lib/evil/libevil.la > -endif > - > lib_ecore_con_libecore_con_la_LIBADD += @ECORE_CON_LIBS@ @EFL_COV_LIBS@ -lm > > lib_ecore_con_libecore_con_la_LDFLAGS = -no-undefined -version-info > @version_info@ @release_info@ > > Modified: trunk/efl/src/Makefile_Ecore_Evas.am > =================================================================== > --- trunk/efl/src/Makefile_Ecore_Evas.am 2012-12-20 19:02:42 UTC (rev > 81476) > +++ trunk/efl/src/Makefile_Ecore_Evas.am 2012-12-20 19:25:51 UTC (rev > 81477) > @@ -30,13 +30,9 @@ > -DPACKAGE_LIB_DIR=\"$(libdir)\" \ > -DEFL_ECORE_EVAS_BUILD \ > @EFL_CFLAGS@ \ > -@EFL_COV_CFLAGS@ > +@EFL_COV_CFLAGS@ \ > +@USE_EVIL_CFLAGS@ > > -if HAVE_WINDOWS > -lib_ecore_evas_libecore_evas_la_CPPFLAGS += \ > --I$(top_srcdir)/src/lib/evil > -endif > - > lib_ecore_evas_libecore_evas_la_LIBADD = \ > lib/ecore_input/libecore_input_evas.la \ > lib/ecore_input/libecore_input.la \ > > Modified: trunk/efl/src/Makefile_Eet.am > =================================================================== > --- trunk/efl/src/Makefile_Eet.am 2012-12-20 19:02:42 UTC (rev 81476) > +++ trunk/efl/src/Makefile_Eet.am 2012-12-20 19:25:51 UTC (rev 81477) > @@ -33,21 +33,16 @@ > -DEFL_EET_BUILD \ > @EFL_CFLAGS@ \ > @EFL_COV_CFLAGS@ \ > -@EET_CFLAGS@ > +@EET_CFLAGS@ \ > +@USE_EVIL_CFLAGS@ > > -if HAVE_WINDOWS > -lib_eet_libeet_la_CPPFLAGS += \ > --I$(top_srcdir)/src/lib/evil > -endif > +lib_eet_libeet_la_LIBADD = \ > +lib/eina/libeina.la \ > +@USE_EVIL_LIBS@ \ > +@EET_LIBS@ \ > +@EFL_COV_LIBS@ \ > +-lm > > -lib_eet_libeet_la_LIBADD = lib/eina/libeina.la > - > -if HAVE_WINDOWS > -lib_eet_libeet_la_LIBADD += lib/evil/libevil.la > -endif > - > -lib_eet_libeet_la_LIBADD += @EET_LIBS@ @EFL_COV_LIBS@ -lm > - > lib_eet_libeet_la_LDFLAGS = -no-undefined -version-info @version_info@ > @release_info@ > > EXTRA_DIST += static_libs/lz4/README > @@ -67,23 +62,16 @@ > -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ > @EFL_CFLAGS@ \ > @EFL_COV_CFLAGS@ \ > -@EET_CFLAGS@ > +@EET_CFLAGS@ \ > +@USE_EVIL_CFLAGS@ > > -if HAVE_WINDOWS > -bin_eet_eet_CPPFLAGS += \ > --I$(top_srcdir)/src/lib/evil > -endif > - > bin_eet_eet_LDADD = \ > lib/eet/libeet.la \ > -lib/eina/libeina.la > +lib/eina/libeina.la \ > +@USE_EVIL_LIBS@ \ > +@EET_LIBS@ \ > +@EFL_COV_LIBS@ > > -if HAVE_WINDOWS > -bin_eet_eet_LDADD += lib/evil/libevil.la > -endif > - > -bin_eet_eet_LDADD += @EET_LIBS@ @EFL_COV_LIBS@ > - > ### Unit tests > > if EFL_ENABLE_TESTS > > Modified: trunk/efl/src/Makefile_Eina.am > =================================================================== > --- trunk/efl/src/Makefile_Eina.am 2012-12-20 19:02:42 UTC (rev 81476) > +++ trunk/efl/src/Makefile_Eina.am 2012-12-20 19:25:51 UTC (rev 81477) > @@ -212,23 +212,11 @@ > @EFL_CFLAGS@ \ > @EFL_COV_CFLAGS@ \ > @EFL_PTHREAD_CFLAGS@ \ > -@EINA_CFLAGS@ > +@EINA_CFLAGS@ \ > +@USE_EVIL_CFLAGS@ > > -if HAVE_WINDOWS > -lib_eina_libeina_la_CPPFLAGS += \ > --I$(top_srcdir)/src/lib/evil > -endif > +lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @EFL_COV_LIBS@ @USE_EVIL_LIBS@ > @DL_LIBS@ -lm > > -lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @EFL_COV_LIBS@ > - > -if HAVE_WINDOWS > -lib_eina_libeina_la_LIBADD += \ > -lib/evil/libevil.la \ > -lib/evil/libdl.la > -endif > - > -lib_eina_libeina_la_LIBADD += -lm > - > lib_eina_libeina_la_LDFLAGS = -no-undefined -version-info @version_info@ > @release_info@ @EFL_PTHREAD_LIBS@ > > ### Script > > Modified: trunk/efl/src/Makefile_Embryo.am > =================================================================== > --- trunk/efl/src/Makefile_Embryo.am 2012-12-20 19:02:42 UTC (rev 81476) > +++ trunk/efl/src/Makefile_Embryo.am 2012-12-20 19:25:51 UTC (rev 81477) > @@ -23,21 +23,11 @@ > -DPACKAGE_LIB_DIR=\"$(libdir)\" \ > -DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ > -DEFL_EMBRYO_BUILD \ > -@EFL_CFLAGS@ > +@EFL_CFLAGS@ \ > +@USE_EVIL_CFLAGS@ > > -if HAVE_WINDOWS > -lib_embryo_libembryo_la_CPPFLAGS += \ > --I$(top_srcdir)/src/lib/evil > -endif > +lib_embryo_libembryo_la_LIBADD = lib/eina/libeina.la @USE_EVIL_LIBS@ -lm > > -lib_embryo_libembryo_la_LIBADD = lib/eina/libeina.la > - > -if HAVE_WINDOWS > -lib_embryo_libembryo_la_LIBADD += lib/evil/libevil.la > -endif > - > -lib_embryo_libembryo_la_LIBADD += -lm > - > lib_embryo_libembryo_la_LDFLAGS = -no-undefined -version-info @version_info@ > @release_info@ > > ### Binary > @@ -67,23 +57,15 @@ > -DPACKAGE_BIN_DIR=\"$(bindir)\" \ > -DPACKAGE_LIB_DIR=\"$(libdir)\" \ > -DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ > -@EFL_CFLAGS@ > +@EFL_CFLAGS@ \ > +@USE_EVIL_CFLAGS@ > > -if HAVE_WINDOWS > -bin_embryo_embryo_cc_CPPFLAGS += \ > --I$(top_srcdir)/src/lib/evil > -endif > - > bin_embryo_embryo_cc_LDADD = \ > lib/embryo/libembryo.la \ > -lib/eina/libeina.la > +lib/eina/libeina.la \ > +@USE_EVIL_LIBS@ \ > +-lm > > -if HAVE_WINDOWS > -bin_embryo_embryo_cc_LDADD += lib/evil/libevil.la > -endif > - > -bin_embryo_embryo_cc_LDADD += -lm > - > EXTRA_DIST += \ > bin/embryo/embryo_cc_sc5.scp \ > bin/embryo/embryo_cc_sc7.scp > > Modified: trunk/efl/src/Makefile_Eo.am > =================================================================== > --- trunk/efl/src/Makefile_Eo.am 2012-12-20 19:02:42 UTC (rev 81476) > +++ trunk/efl/src/Makefile_Eo.am 2012-12-20 19:25:51 UTC (rev 81477) > @@ -19,13 +19,9 @@ > -DEFL_EO_BUILD \ > @EFL_CFLAGS@ \ > @EFL_COV_CFLAGS@ \ > -@EO_CFLAGS@ > +@EO_CFLAGS@ \ > +@USE_EVIL_CFLAGS@ > > -if HAVE_WINDOWS > -lib_eo_libeo_la_CPPFLAGS += \ > --I$(top_srcdir)/src/lib/evil > -endif > - > lib_eo_libeo_la_LIBADD = lib/eina/libeina.la @EO_LIBS@ @EFL_COV_LIBS@ > > lib_eo_libeo_la_LDFLAGS = -no-undefined -version-info @version_info@ > @release_info@ > > Modified: trunk/efl/src/Makefile_Evas.am > =================================================================== > --- trunk/efl/src/Makefile_Evas.am 2012-12-20 19:02:42 UTC (rev 81476) > +++ trunk/efl/src/Makefile_Evas.am 2012-12-20 19:25:51 UTC (rev 81477) > @@ -207,7 +207,8 @@ > @EFL_CFLAGS@ \ > @EFL_COV_CFLAGS@ \ > @EVAS_CFLAGS@ \ > -@ALTIVEC_CFLAGS@ > +@ALTIVEC_CFLAGS@ \ > +@USE_EVIL_CFLAGS@ > > # SSE3 > noinst_LTLIBRARIES += lib/evas/common/libevas_op_blend_sse3.la > @@ -222,11 +223,6 @@ > > lib_evas_common_libevas_op_blend_sse3_la_LIBADD = @EFL_COV_LIBS@ > > -if HAVE_WINDOWS > -lib_evas_libevas_la_CPPFLAGS += \ > --I$(top_srcdir)/src/lib/evil > -endif > - > lib_evas_libevas_la_CXXFLAGS = > > lib_evas_libevas_la_LIBADD = \ > @@ -409,11 +405,8 @@ > -I$(top_srcdir)/src/lib/evas/cserve2 \ > -DEFL_EVAS_BUILD \ > @EFL_CFLAGS@ \ > -@EVAS_CFLAGS@ > -if HAVE_WINDOWS > -modules_evas_engines_buffer_module_la_CPPFLAGS += \ > --I$(top_srcdir)/src/lib/evil > -endif > +@EVAS_CFLAGS@ \ > +@USE_EVIL_CFLAGS@ > modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la @EFL_LIBS@ > modules_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module > -avoid-version > modules_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static > @@ -763,11 +756,8 @@ > -DEFL_EVAS_BUILD \ > @evas_engine_software_ddraw_cflags@ \ > @EFL_CFLAGS@ \ > -@EVAS_CFLAGS@ > -if HAVE_WINDOWS > -modules_evas_engines_software_ddraw_module_la_CPPFLAGS += \ > --I$(top_srcdir)/src/lib/evil > -endif > +@EVAS_CFLAGS@ \ > +@USE_EVIL_CFLAGS@ > modules_evas_engines_software_ddraw_module_la_CXXFLAGS = -fno-rtti > -fno-exceptions > modules_evas_engines_software_ddraw_module_la_LIBADD = \ > lib/evas/libevas.la \ > @@ -804,11 +794,8 @@ > -DEFL_EVAS_BUILD \ > @evas_engine_software_gdi_cflags@ \ > @EFL_CFLAGS@ \ > -@EVAS_CFLAGS@ > -if HAVE_WINDOWS > -modules_evas_engines_software_gdi_module_la_CPPFLAGS += \ > --I$(top_srcdir)/src/lib/evil > -endif > +@EVAS_CFLAGS@ \ > +@USE_EVIL_CFLAGS@ > modules_evas_engines_software_gdi_module_la_LIBADD = \ > lib/evas/libevas.la \ > @evas_engine_software_gdi_libs@ \ > @@ -1325,11 +1312,8 @@ > -DEFL_EVAS_BUILD \ > @evas_image_loader_tiff_cflags@ \ > @EFL_CFLAGS@ \ > -@EVAS_CFLAGS@ > -if HAVE_WINDOWS > -modules_evas_loaders_tiff_module_la_CPPFLAGS += \ > --I$(top_srcdir)/src/lib/evil > -endif > +@EVAS_CFLAGS@ \ > +@USE_EVIL_CFLAGS@ > modules_evas_loaders_tiff_module_la_LIBADD = \ > lib/evas/libevas.la \ > @EFL_LIBS@ \ > @@ -1349,11 +1333,8 @@ > -DEFL_EVAS_BUILD \ > @evas_image_loader_tiff_cflags@ \ > @EFL_CFLAGS@ \ > -@EVAS_CFLAGS@ > -if HAVE_WINDOWS > -modules_evas_savers_tiff_module_la_CPPFLAGS += \ > --I$(top_srcdir)/src/lib/evil > -endif > +@EVAS_CFLAGS@ \ > +@USE_EVIL_CFLAGS@ > modules_evas_savers_tiff_module_la_LIBADD = \ > lib/evas/libevas.la \ > @EFL_LIBS@ \ > > Modified: trunk/efl/src/Makefile_Evil.am > =================================================================== > --- trunk/efl/src/Makefile_Evil.am 2012-12-20 19:02:42 UTC (rev 81476) > +++ trunk/efl/src/Makefile_Evil.am 2012-12-20 19:25:51 UTC (rev 81477) > @@ -161,11 +161,6 @@ > @EFL_CFLAGS@ \ > @EVIL_CPPFLAGS@ > > -if HAVE_WINDOWS > -bin_evil_evil_suite_CPPFLAGS += \ > --I$(top_srcdir)/src/lib/evil > -endif > - > bin_evil_evil_suite_LDADD = \ > lib/evil/libevil.la \ > lib/evil/libdl.la \ > > > ------------------------------------------------------------------------------ > LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial > Remotely access PCs and mobile devices and provide instant support > Improve your efficiency, and focus on delivering more value-add services > Discover what IT Professionals Know. Rescue delivers > http://p.sf.net/sfu/logmein_12329d2d > _______________________________________________ > enlightenment-svn mailing list > enlightenment-...@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn ------------------------------------------------------------------------------ LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
