summaryrefslogtreecommitdiff
path: root/src/Makefile_Evas.am
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-11-05 09:25:44 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-11-05 09:25:44 +0000
commit8091219f10a6e3ba0b46830109c3cf472fd1dfd8 (patch)
treef6087662068c3ebda54da25d2719e2af2db74c4b /src/Makefile_Evas.am
parent741703b11d5712356840a41ab66308987f1145cb (diff)
merge: evas fixes
* gl engines were checking for eet module, which does not exist when we install first the efl package. * fix pkgconfig values for static linking * add Evas output to configure SVN revision: 78918
Diffstat (limited to 'src/Makefile_Evas.am')
-rw-r--r--src/Makefile_Evas.am24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 0e2bbeb..1928b41 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -684,7 +684,7 @@ modules/evas/engines/gl_common/shader/yuy2_vert.h \
684modules/evas/engines/gl_common/shader/yuy2_vert.shd 684modules/evas/engines/gl_common/shader/yuy2_vert.shd
685if EVAS_STATIC_BUILD_GL_COMMON 685if EVAS_STATIC_BUILD_GL_COMMON
686lib_evas_libevas_la_SOURCES += $(GL_COMMON_SOURCES) 686lib_evas_libevas_la_SOURCES += $(GL_COMMON_SOURCES)
687lib_evas_libevas_la_LIBADD += @GL_EET_LIBS@ @evas_engine_gl_common_libs@ 687lib_evas_libevas_la_LIBADD += @evas_engine_gl_common_libs@
688else 688else
689noinst_LTLIBRARIES = modules/evas/engines/gl_common/libevas_engine_gl_common.la 689noinst_LTLIBRARIES = modules/evas/engines/gl_common/libevas_engine_gl_common.la
690modules_evas_engines_gl_common_libevas_engine_gl_common_la_SOURCES = $(GL_COMMON_SOURCES) 690modules_evas_engines_gl_common_libevas_engine_gl_common_la_SOURCES = $(GL_COMMON_SOURCES)
@@ -693,19 +693,20 @@ modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = \
693-I$(top_builddir)/src/lib/eina \ 693-I$(top_builddir)/src/lib/eina \
694-I$(top_srcdir)/src/lib/eo \ 694-I$(top_srcdir)/src/lib/eo \
695-I$(top_builddir)/src/lib/eo \ 695-I$(top_builddir)/src/lib/eo \
696-I$(top_srcdir)/src/lib/eet \
697-I$(top_builddir)/src/lib/eet \
696-I$(top_srcdir)/src/lib/evas \ 698-I$(top_srcdir)/src/lib/evas \
697-I$(top_builddir)/src/lib/evas \ 699-I$(top_builddir)/src/lib/evas \
698-I$(top_srcdir)/src/lib/evas/include \ 700-I$(top_srcdir)/src/lib/evas/include \
699-I$(top_builddir)/src/lib/evas/include \ 701-I$(top_builddir)/src/lib/evas/include \
700-I$(top_srcdir)/src/lib/evas/cserve2 \ 702-I$(top_srcdir)/src/lib/evas/cserve2 \
701-I$(top_builddir)/src/lib/evas/cserve2 \ 703-I$(top_builddir)/src/lib/evas/cserve2 \
702@GL_EET_CFLAGS@ \
703@EFL_CFLAGS@ \ 704@EFL_CFLAGS@ \
704@EVAS_CFLAGS@ 705@EVAS_CFLAGS@
705modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = \ 706modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = \
707lib/eet/libeet.la \
706lib/evas/libevas.la \ 708lib/evas/libevas.la \
707@EFL_LIBS@ \ 709@EFL_LIBS@
708@GL_EET_LIBS@
709modules_evas_engines_gl_common_libevas_engine_gl_common_la_LDFLAGS = -no-undefined -module -avoid-version 710modules_evas_engines_gl_common_libevas_engine_gl_common_la_LDFLAGS = -no-undefined -module -avoid-version
710modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBTOOLFLAGS = --tag=disable-static 711modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBTOOLFLAGS = --tag=disable-static
711endif 712endif
@@ -721,12 +722,10 @@ if EVAS_STATIC_BUILD_GL_COCOA
721lib_evas_libevas_la_SOURCES += $(GL_COCOA_SOURCES) 722lib_evas_libevas_la_SOURCES += $(GL_COCOA_SOURCES)
722lib_evas_libevas_la_CPPFLAGS += \ 723lib_evas_libevas_la_CPPFLAGS += \
723-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 724-I$(top_srcdir)/src/modules/evas/engines/gl_common \
724@GL_EET_CFLAGS@ \
725@evas_engine_gl_cocoa_cflags@ 725@evas_engine_gl_cocoa_cflags@
726lib_evas_libevas_la_LIBADD += \ 726lib_evas_libevas_la_LIBADD += \
727lib/evas/libevas.la \ 727lib/evas/libevas.la \
728modules/evas/engines/gl_common/libevas_engine_gl_common.la \ 728modules/evas/engines/gl_common/libevas_engine_gl_common.la \
729@GL_EET_LIBS@ \
730@evas_engine_gl_cocoa_libs@ 729@evas_engine_gl_cocoa_libs@
731else 730else
732engineglcocoapkgdir = $(libdir)/evas/modules/engines/gl_cocoa/$(MODULE_ARCH) 731engineglcocoapkgdir = $(libdir)/evas/modules/engines/gl_cocoa/$(MODULE_ARCH)
@@ -737,6 +736,8 @@ modules_evas_engines_gl_cocoa_module_la_CPPFLAGS = \
737-I$(top_builddir)/src/lib/eina \ 736-I$(top_builddir)/src/lib/eina \
738-I$(top_srcdir)/src/lib/eo \ 737-I$(top_srcdir)/src/lib/eo \
739-I$(top_builddir)/src/lib/eo \ 738-I$(top_builddir)/src/lib/eo \
739-I$(top_srcdir)/src/lib/eet \
740-I$(top_builddir)/src/lib/eet \
740-I$(top_srcdir)/src/lib/evas \ 741-I$(top_srcdir)/src/lib/evas \
741-I$(top_builddir)/src/lib/evas \ 742-I$(top_builddir)/src/lib/evas \
742-I$(top_srcdir)/src/lib/evas/include \ 743-I$(top_srcdir)/src/lib/evas/include \
@@ -746,13 +747,12 @@ modules_evas_engines_gl_cocoa_module_la_CPPFLAGS = \
746-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 747-I$(top_srcdir)/src/modules/evas/engines/gl_common \
747-I$(top_builddir)/src/modules/evas/engines/gl_common \ 748-I$(top_builddir)/src/modules/evas/engines/gl_common \
748@evas_engine_gl_cocoa_cflags@ \ 749@evas_engine_gl_cocoa_cflags@ \
749@GL_EET_CFLAGS@ \
750@EFL_CFLAGS@ \ 750@EFL_CFLAGS@ \
751@EVAS_CFLAGS@ 751@EVAS_CFLAGS@
752modules_evas_engines_gl_cocoa_module_la_LIBADD = \ 752modules_evas_engines_gl_cocoa_module_la_LIBADD = \
753modules/evas/engines/gl_common/libevas_engine_gl_common.la \ 753modules/evas/engines/gl_common/libevas_engine_gl_common.la \
754lib/eet/libeet.la \
754lib/evas/libevas.la \ 755lib/evas/libevas.la \
755@GL_EET_LIBS@ \
756@EFL_LIBS@ \ 756@EFL_LIBS@ \
757@evas_engine_gl_cocoa_libs@ 757@evas_engine_gl_cocoa_libs@
758modules_evas_engines_gl_cocoa_module_la_LDFLAGS = -no-undefined -module -avoid-version 758modules_evas_engines_gl_cocoa_module_la_LDFLAGS = -no-undefined -module -avoid-version
@@ -813,7 +813,6 @@ if EVAS_STATIC_BUILD_GL_X11
813lib_evas_libevas_la_SOURCES += $(GL_X11_SOURCES) 813lib_evas_libevas_la_SOURCES += $(GL_X11_SOURCES)
814lib_evas_libevas_la_CPPFLAGS += \ 814lib_evas_libevas_la_CPPFLAGS += \
815-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 815-I$(top_srcdir)/src/modules/evas/engines/gl_common \
816@GL_EET_CFLAGS@ \
817@evas_engine_gl_xlib_cflags@ 816@evas_engine_gl_xlib_cflags@
818lib_evas_libevas_la_LIBADD += \ 817lib_evas_libevas_la_LIBADD += \
819modules/evas/engines/gl_common/libevas_engine_gl_common.la \ 818modules/evas/engines/gl_common/libevas_engine_gl_common.la \
@@ -827,6 +826,8 @@ modules_evas_engines_gl_x11_module_la_CPPFLAGS = \
827-I$(top_builddir)/src/lib/eina \ 826-I$(top_builddir)/src/lib/eina \
828-I$(top_srcdir)/src/lib/eo \ 827-I$(top_srcdir)/src/lib/eo \
829-I$(top_builddir)/src/lib/eo \ 828-I$(top_builddir)/src/lib/eo \
829-I$(top_srcdir)/src/lib/eet \
830-I$(top_builddir)/src/lib/eet \
830-I$(top_srcdir)/src/lib/evas \ 831-I$(top_srcdir)/src/lib/evas \
831-I$(top_builddir)/src/lib/evas \ 832-I$(top_builddir)/src/lib/evas \
832-I$(top_srcdir)/src/lib/evas/include \ 833-I$(top_srcdir)/src/lib/evas/include \
@@ -836,13 +837,12 @@ modules_evas_engines_gl_x11_module_la_CPPFLAGS = \
836-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 837-I$(top_srcdir)/src/modules/evas/engines/gl_common \
837-I$(top_builddir)/src/modules/evas/engines/gl_common \ 838-I$(top_builddir)/src/modules/evas/engines/gl_common \
838@evas_engine_gl_xlib_cflags@ \ 839@evas_engine_gl_xlib_cflags@ \
839@GL_EET_CFLAGS@ \
840@EFL_CFLAGS@ \ 840@EFL_CFLAGS@ \
841@EVAS_CFLAGS@ 841@EVAS_CFLAGS@
842modules_evas_engines_gl_x11_module_la_LIBADD = \ 842modules_evas_engines_gl_x11_module_la_LIBADD = \
843modules/evas/engines/gl_common/libevas_engine_gl_common.la \ 843modules/evas/engines/gl_common/libevas_engine_gl_common.la \
844lib/eet/libeet.la \
844lib/evas/libevas.la \ 845lib/evas/libevas.la \
845@GL_EET_LIBS@ \
846@EFL_LIBS@ \ 846@EFL_LIBS@ \
847@evas_engine_gl_xlib_libs@ 847@evas_engine_gl_xlib_libs@
848modules_evas_engines_gl_x11_module_la_LDFLAGS = -no-undefined -module -avoid-version 848modules_evas_engines_gl_x11_module_la_LDFLAGS = -no-undefined -module -avoid-version
@@ -859,7 +859,7 @@ modules/evas/engines/psl1ght/evas_engine.h \
859modules/evas/engines/psl1ght/rsxutil.h 859modules/evas/engines/psl1ght/rsxutil.h
860if EVAS_STATIC_BUILD_PSL1GHT 860if EVAS_STATIC_BUILD_PSL1GHT
861lib_evas_libevas_la_SOURCES += $(PSL1GHT_SOURCES) 861lib_evas_libevas_la_SOURCES += $(PSL1GHT_SOURCES)
862lib_evas_libevas_la_CPPFLAGS += @GL_EET_CFLAGS@ @evas_engine_psl1ght_cflags@ 862lib_evas_libevas_la_CPPFLAGS += @evas_engine_psl1ght_cflags@
863lib_evas_libevas_la_LIBADD += @evas_engine_psl1ght_libs@ 863lib_evas_libevas_la_LIBADD += @evas_engine_psl1ght_libs@
864else 864else
865enginepsl1ghtpkgdir = $(libdir)/evas/modules/engines/psl1ght/$(MODULE_ARCH) 865enginepsl1ghtpkgdir = $(libdir)/evas/modules/engines/psl1ght/$(MODULE_ARCH)