cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=6f8599360223b7139647611e1f9a9bdbe2ffe41e
commit 6f8599360223b7139647611e1f9a9bdbe2ffe41e Author: Cedric BAIL <[email protected]> Date: Thu Feb 20 19:36:03 2014 +0900 doc: fix build on windows. --- doc/previews/Makefile.am | 65 ++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/doc/previews/Makefile.am b/doc/previews/Makefile.am index 864e583..4337167 100644 --- a/doc/previews/Makefile.am +++ b/doc/previews/Makefile.am @@ -3,34 +3,35 @@ if EFL_BUILD_DOC .PHONY: doc AM_CPPFLAGS = \ - -I$(abs_top_srcdir)/src/lib/eo \ - -I$(abs_top_srcdir)/src/lib/efl \ - -I$(abs_top_srcdir)/src/lib/eina \ - -I$(abs_top_srcdir)/src/lib/evas \ - -I$(abs_top_srcdir)/src/lib/ecore \ - -I$(abs_top_srcdir)/src/lib/ecore_evas \ - -DEFL_BETA_API_SUPPORT=1 \ - -DEFL_EO_API_SUPPORT=1 \ - -D_GNU_SOURCE +-I$(top_builddir)/src/lib/efl \ +-I. \ +-I$(builddir) \ +-I$(top_srcdir)/src/lib/evil \ +-I$(top_builddir)/src/lib/evil \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/eet \ +-I$(top_builddir)/src/lib/eet \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/ecore \ +-I$(top_builddir)/src/lib/ecore \ +-I$(top_srcdir)/src/lib/ecore_evas \ +-I$(top_builddir)/src/lib/ecore_evas \ +-DEFL_BETA_API_SUPPORT=1 \ +-DEFL_EO_API_SUPPORT=1 \ +@ECORE_EVAS_LDFLAGS@ LDADD = \ - -L$(abs_top_builddir)/src/lib/eo/.libs \ - -L$(abs_top_builddir)/src/lib/eina/.libs \ - -L$(abs_top_builddir)/src/lib/ecore/.libs \ - -L$(abs_top_builddir)/src/lib/evas/.libs \ - -L$(abs_top_builddir)/src/lib/ecore_evas/.libs \ - -leo \ - -leina \ - -levas \ - -lecore \ - -lecore_evas - -if HAVE_WIN32 -AM_CPPFLAGS += -I$(abs_top_srcdir)/src/lib/evil @EVIL_CFLAGS@ -LDADD += -L$(abs_top_builddir)/src/lib/evil/.libs \ - -levil \ - -ldl -endif +$(top_builddir)/src/lib/eina/libeina.la \ +$(top_builddir)/src/lib/eo/libeo.la \ +$(top_builddir)/src/lib/eet/libeet.la \ +$(top_builddir)/src/lib/evas/libevas.la \ +$(top_builddir)/src/lib/ecore/libecore.la \ +$(top_builddir)/src/lib/ecore_evas/libecore_evas.la \ +@ECORE_EVAS_LDFLAGS@ noinst_PROGRAMS = preview_text_filter @@ -40,22 +41,22 @@ HTMLDIR = ${abs_top_srcdir}/doc/html PREVIEWS = blend blur bump curve grow mask transform \ example_1 -previews-data: +previews-data: preview_text_filter $(MKDIR_P) $(DATADIR) $(MKDIR_P) $(HTMLDIR) @for a in $(PREVIEWS) ; do \ echo " GEN filter_$${a}.png" ; \ FONT="Sans" ; \ SIZE=24 ; \ - FILTER=`cat ${abs_top_srcdir}/src/examples/evas/filters/filter_$${a}.txt` ; \ - if [ -e ${abs_top_srcdir}/doc/previews/filter_$${a}.sh ] ; then \ - source ${abs_top_srcdir}/doc/previews/filter_$${a}.sh ; \ + FILTER=`cat ${top_srcdir}/src/examples/evas/filters/filter_$${a}.txt` ; \ + if [ -e ${top_srcdir}/doc/previews/filter_$${a}.sh ] ; then \ + source ${top_srcdir}/doc/previews/filter_$${a}.sh ; \ fi ; \ - $(abs_top_srcdir)/doc/previews/preview_text_filter "$${TEXT}" "$${FILTER}" "$(DATADIR)/filter_$${a}.png" "$${FONT}" "$${SIZE}" ; \ + $(top_builddir)/doc/previews/preview_text_filter "$${TEXT}" "$${FILTER}" "$(DATADIR)/filter_$${a}.png" "$${FONT}" "$${SIZE}" ; \ cp "$(DATADIR)/filter_$${a}.png" "$(HTMLDIR)/" ; \ done -doc: Makefile preview_text_filter previews-data +doc: Makefile previews-data endif --
