Makefile.am   Makefile.am 
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = canvas cache cserve file engines include SUBDIRS = canvas cache cache2 cserve cserve2 file engines include
EVAS_STATIC_MODULE = EVAS_STATIC_MODULE =
EVAS_STATIC_LIBADD = EVAS_STATIC_LIBADD =
if EVAS_STATIC_BUILD_SOFTWARE_GENERIC if EVAS_STATIC_BUILD_SOFTWARE_GENERIC
SUBDIRS += ../modules/engines/software_generic/ SUBDIRS += ../modules/engines/software_generic/
EVAS_STATIC_MODULE += ../modules/engines/software_generic/libevas_engine_so ftware_generic.la EVAS_STATIC_MODULE += ../modules/engines/software_generic/libevas_engine_so ftware_generic.la
endif endif
if EVAS_STATIC_BUILD_BUFFER if EVAS_STATIC_BUILD_BUFFER
SUBDIRS += ../modules/engines/buffer/ SUBDIRS += ../modules/engines/buffer/
EVAS_STATIC_MODULE += ../modules/engines/buffer/libevas_engine_buffer.la EVAS_STATIC_MODULE += ../modules/engines/buffer/libevas_engine_buffer.la
skipping to change at line 55 skipping to change at line 55
endif endif
if EVAS_STATIC_BUILD_PSL1GHT if EVAS_STATIC_BUILD_PSL1GHT
SUBDIRS += ../modules/engines/psl1ght/ SUBDIRS += ../modules/engines/psl1ght/
EVAS_STATIC_MODULE += ../modules/engines/psl1ght/libevas_engine_psl1ght.la EVAS_STATIC_MODULE += ../modules/engines/psl1ght/libevas_engine_psl1ght.la
EVAS_STATIC_LIBADD += @evas_engine_psl1ght_libs@ EVAS_STATIC_LIBADD += @evas_engine_psl1ght_libs@
endif endif
if EVAS_STATIC_BUILD_SOFTWARE_16 if EVAS_STATIC_BUILD_SOFTWARE_16
SUBDIRS += ../modules/engines/software_16/ SUBDIRS += ../modules/engines/software_16/
EVAS_STATIC_MODULE += ../modules/engines/software_16/libevas_engine_softwar e_16.la EVAS_STATIC_MODULE += ../modules/engines/software_16/libevas_engine_softwar e_16.la
endif endif
if EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW
SUBDIRS += ../modules/engines/software_16_ddraw/
EVAS_STATIC_MODULE += ../modules/engines/software_16_ddraw/libevas_engine_s
oftware_16_ddraw.la
EVAS_STATIC_LIBADD += @evas_engine_software_16_ddraw_libs@
endif
if EVAS_STATIC_BUILD_SOFTWARE_16_WINCE if EVAS_STATIC_BUILD_SOFTWARE_16_WINCE
SUBDIRS += ../modules/engines/software_16_wince/ SUBDIRS += ../modules/engines/software_16_wince/
EVAS_STATIC_MODULE += ../modules/engines/software_16_wince/libevas_engine_s oftware_16_wince.la EVAS_STATIC_MODULE += ../modules/engines/software_16_wince/libevas_engine_s oftware_16_wince.la
EVAS_STATIC_LIBADD += @evas_engine_software_16_wince_libs@ EVAS_STATIC_LIBADD += @evas_engine_software_16_wince_libs@
endif endif
if EVAS_STATIC_BUILD_SOFTWARE_16_X11 if EVAS_STATIC_BUILD_SOFTWARE_16_X11
SUBDIRS += ../modules/engines/software_16_x11/ SUBDIRS += ../modules/engines/software_16_x11/
EVAS_STATIC_MODULE += ../modules/engines/software_16_x11/libevas_engine_sof tware_16_x11.la EVAS_STATIC_MODULE += ../modules/engines/software_16_x11/libevas_engine_sof tware_16_x11.la
EVAS_STATIC_LIBADD += @evas_engine_software_16_x11_libs@ EVAS_STATIC_LIBADD += @evas_engine_software_16_x11_libs@
endif endif
skipping to change at line 193 skipping to change at line 188
EVAS_STATIC_LIBADD += @evas_image_loader_xpm_libs@ EVAS_STATIC_LIBADD += @evas_image_loader_xpm_libs@
endif endif
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I. \ -I. \
-I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/lib/include \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
@EINA_CFLAGS@ \ @EVAS_GENERAL_CFLAGS@ \
@FREETYPE_CFLAGS@ \ @FREETYPE_CFLAGS@ \
@FRIBIDI_CFLAGS@ \ @FRIBIDI_CFLAGS@ \
@HARFBUZZ_CFLAGS@ \ @HARFBUZZ_CFLAGS@ \
@EET_CFLAGS@ \ @EET_CFLAGS@ \
@FONTCONFIG_CFLAGS@ \ @FONTCONFIG_CFLAGS@ \
@pthread_cflags@ \ @pthread_cflags@ \
@PIXMAN_CFLAGS@ @PIXMAN_CFLAGS@
lib_LTLIBRARIES = libevas.la lib_LTLIBRARIES = libevas.la
skipping to change at line 215 skipping to change at line 210
includesdir = $(includedir)/evas-@VMAJ@ includesdir = $(includedir)/evas-@VMAJ@
libevas_la_SOURCES = main.c libevas_la_SOURCES = main.c
if EVAS_CSERVE if EVAS_CSERVE
libevas_cserve_la = cserve/libevas_cserve.la libevas_cserve_la = cserve/libevas_cserve.la
endif endif
if EVAS_CSERVE2
libevas_cserve2_la = cserve2/libevas_cserve2.la
endif
libevas_la_LIBADD = \ libevas_la_LIBADD = \
canvas/libevas_canvas.la \ canvas/libevas_canvas.la \
file/libevas_file.la \ file/libevas_file.la \
cache/libevas_cache.la \ cache/libevas_cache.la \
$(libevas_cserve_la) \ $(libevas_cserve_la) \
$(libevas_cserve2_la) \
engines/common/libevas_engine_common.la \ engines/common/libevas_engine_common.la \
@FREETYPE_LIBS@ \ @FREETYPE_LIBS@ \
@FRIBIDI_LIBS@ \ @FRIBIDI_LIBS@ \
@HARFBUZZ_LIBS@ \ @HARFBUZZ_LIBS@ \
@EET_LIBS@ \ @EET_LIBS@ \
@FONTCONFIG_LIBS@ \ @FONTCONFIG_LIBS@ \
@pthread_libs@ \ @pthread_libs@ \
@EINA_LIBS@ \ @EVAS_GENERAL_LIBS@ \
$(EVAS_STATIC_MODULE) \ $(EVAS_STATIC_MODULE) \
$(EVAS_STATIC_LIBADD) \ $(EVAS_STATIC_LIBADD) \
@PIXMAN_LIBS@ \ @PIXMAN_LIBS@ \
-lm -lm
libevas_la_DEPENDENCIES = \ libevas_la_DEPENDENCIES = \
canvas/libevas_canvas.la \ canvas/libevas_canvas.la \
file/libevas_file.la \ file/libevas_file.la \
cache/libevas_cache.la \ cache/libevas_cache.la \
$(libevas_cserve_la) \ $(libevas_cserve_la) \
$(libevas_cserve2_la) \
engines/common/libevas_engine_common.la \ engines/common/libevas_engine_common.la \
$(EVAS_STATIC_MODULE) $(EVAS_STATIC_MODULE)
if EVAS_CSERVE2
libevas_la_LIBADD += \
cache2/libevas_cache2.la
libevas_la_DEPENDENCIES += \
cache2/libevas_cache2.la
endif
if BUILD_ENGINE_SOFTWARE_16 if BUILD_ENGINE_SOFTWARE_16
libevas_la_LIBADD += engines/common_16/libevas_engine_common_16.la libevas_la_LIBADD += engines/common_16/libevas_engine_common_16.la
libevas_la_DEPENDENCIES += engines/common_16/libevas_engine_common_16.la libevas_la_DEPENDENCIES += engines/common_16/libevas_engine_common_16.la
endif endif
if BUILD_ENGINE_SOFTWARE_8 if BUILD_ENGINE_SOFTWARE_8
libevas_la_LIBADD += engines/common_8/libevas_engine_common_8.la libevas_la_LIBADD += engines/common_8/libevas_engine_common_8.la
libevas_la_DEPENDENCIES += engines/common_8/libevas_engine_common_8.la libevas_la_DEPENDENCIES += engines/common_8/libevas_engine_common_8.la
endif endif
libevas_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @v ersion_info@ @release_info@ libevas_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @v ersion_info@ @release_info@
### Evas_GL we are still using it in our code, so just don't install it. ### Evas_GL we are still using it in our code, so just don't install it.
EXTRA_DIST=Evas_GL.h EXTRA_DIST=Evas_GL.h
DIST_SUBDIRS = canvas cache cserve file engines include DIST_SUBDIRS = canvas cache cache2 cserve cserve2 file engines include
 End of changes. 9 change blocks. 
9 lines changed or deleted 21 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/