summaryrefslogtreecommitdiff
path: root/src/Makefile_Evas.am
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-12-03 16:54:10 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-12-03 16:54:10 +0000
commit9e8e98f736cf3f0149b02d52e235402486647b53 (patch)
treed1ae2a1abf8ff4d7cf250a5de18c58caea596226 /src/Makefile_Evas.am
parent9af2e7f69b2eb0382a5fd71df61e67590a61083f (diff)
Evas: fix static gl engines compilation, and maybe others too
SVN revision: 80085
Diffstat (limited to 'src/Makefile_Evas.am')
-rw-r--r--src/Makefile_Evas.am27
1 files changed, 18 insertions, 9 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 62b86c0..3b7aa80 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -682,7 +682,6 @@ lib_evas_libevas_la_CPPFLAGS += \
682-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 682-I$(top_srcdir)/src/modules/evas/engines/gl_common \
683@evas_engine_gl_cocoa_cflags@ 683@evas_engine_gl_cocoa_cflags@
684lib_evas_libevas_la_LIBADD += \ 684lib_evas_libevas_la_LIBADD += \
685modules/evas/engines/gl_common/libevas_engine_gl_common.la \
686@evas_engine_gl_cocoa_libs@ 685@evas_engine_gl_cocoa_libs@
687else 686else
688engineglcocoapkgdir = $(libdir)/evas/modules/engines/gl_cocoa/$(MODULE_ARCH) 687engineglcocoapkgdir = $(libdir)/evas/modules/engines/gl_cocoa/$(MODULE_ARCH)
@@ -706,8 +705,12 @@ modules_evas_engines_gl_cocoa_module_la_CPPFLAGS = \
706@evas_engine_gl_cocoa_cflags@ \ 705@evas_engine_gl_cocoa_cflags@ \
707@EFL_CFLAGS@ \ 706@EFL_CFLAGS@ \
708@EVAS_CFLAGS@ 707@EVAS_CFLAGS@
709modules_evas_engines_gl_cocoa_module_la_LIBADD = \ 708modules_evas_engines_gl_cocoa_module_la_LIBADD =
710modules/evas/engines/gl_common/libevas_engine_gl_common.la \ 709if ! EVAS_STATIC_BUILD_GL_COMMON
710modules_evas_engines_gl_cocoa_module_la_LIBADD += \
711modules/evas/engines/gl_common/libevas_engine_gl_common.la
712endif
713modules_evas_engines_gl_cocoa_module_la_LIBADD += \
711lib/eet/libeet.la \ 714lib/eet/libeet.la \
712lib/evas/libevas.la \ 715lib/evas/libevas.la \
713@EFL_LIBS@ \ 716@EFL_LIBS@ \
@@ -728,7 +731,6 @@ lib_evas_libevas_la_CPPFLAGS += \
728-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 731-I$(top_srcdir)/src/modules/evas/engines/gl_common \
729@evas_engine_gl_sdl_cflags@ 732@evas_engine_gl_sdl_cflags@
730lib_evas_libevas_la_LIBADD += \ 733lib_evas_libevas_la_LIBADD += \
731modules/evas/engines/gl_common/libevas_engine_gl_common.la \
732@evas_engine_gl_sdl_libs@ 734@evas_engine_gl_sdl_libs@
733else 735else
734engineglsdlpkgdir = $(libdir)/evas/modules/engines/gl_sdl/$(MODULE_ARCH) 736engineglsdlpkgdir = $(libdir)/evas/modules/engines/gl_sdl/$(MODULE_ARCH)
@@ -752,8 +754,12 @@ modules_evas_engines_gl_sdl_module_la_CPPFLAGS = \
752@evas_engine_gl_sdl_cflags@ \ 754@evas_engine_gl_sdl_cflags@ \
753@EFL_CFLAGS@ \ 755@EFL_CFLAGS@ \
754@EVAS_CFLAGS@ 756@EVAS_CFLAGS@
755modules_evas_engines_gl_sdl_module_la_LIBADD = \ 757modules_evas_engines_gl_sdl_module_la_LIBADD =
756modules/evas/engines/gl_common/libevas_engine_gl_common.la \ 758if ! EVAS_STATIC_BUILD_GL_COMMON
759modules_evas_engines_gl_sdl_module_la_LIBADD += \
760modules/evas/engines/gl_common/libevas_engine_gl_common.la
761endif
762modules_evas_engines_gl_sdl_module_la_LIBADD += \
757lib/evas/libevas.la \ 763lib/evas/libevas.la \
758@EFL_LIBS@ \ 764@EFL_LIBS@ \
759@evas_engine_gl_sdl_libs@ 765@evas_engine_gl_sdl_libs@
@@ -774,7 +780,6 @@ lib_evas_libevas_la_CPPFLAGS += \
774-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 780-I$(top_srcdir)/src/modules/evas/engines/gl_common \
775@evas_engine_gl_xlib_cflags@ 781@evas_engine_gl_xlib_cflags@
776lib_evas_libevas_la_LIBADD += \ 782lib_evas_libevas_la_LIBADD += \
777modules/evas/engines/gl_common/libevas_engine_gl_common.la \
778@evas_engine_gl_xlib_libs@ 783@evas_engine_gl_xlib_libs@
779else 784else
780engineglx11pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH) 785engineglx11pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH)
@@ -798,8 +803,12 @@ modules_evas_engines_gl_x11_module_la_CPPFLAGS = \
798@evas_engine_gl_xlib_cflags@ \ 803@evas_engine_gl_xlib_cflags@ \
799@EFL_CFLAGS@ \ 804@EFL_CFLAGS@ \
800@EVAS_CFLAGS@ 805@EVAS_CFLAGS@
801modules_evas_engines_gl_x11_module_la_LIBADD = \ 806modules_evas_engines_gl_x11_module_la_LIBADD =
802modules/evas/engines/gl_common/libevas_engine_gl_common.la \ 807if ! EVAS_STATIC_BUILD_GL_COMMON
808modules_evas_engines_gl_x11_module_la_LIBADD += \
809modules/evas/engines/gl_common/libevas_engine_gl_common.la
810endif
811modules_evas_engines_gl_x11_module_la_LIBADD += \
803lib/eet/libeet.la \ 812lib/eet/libeet.la \
804lib/evas/libevas.la \ 813lib/evas/libevas.la \
805@EFL_LIBS@ \ 814@EFL_LIBS@ \