summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pc/ector.pc.in4
-rw-r--r--src/Makefile_Ector.am21
2 files changed, 5 insertions, 20 deletions
diff --git a/pc/ector.pc.in b/pc/ector.pc.in
index 43d2db10f4..3f4638f93b 100644
--- a/pc/ector.pc.in
+++ b/pc/ector.pc.in
@@ -4,9 +4,9 @@ libdir=@libdir@
4includedir=@includedir@ 4includedir=@includedir@
5 5
6Name: ector 6Name: ector
7Description: Enlightenned retained mode drawing library 7Description: Enlightened retained mode drawing library
8Requires.private: @requirements_pc_ector@ 8Requires.private: @requirements_pc_ector@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lector 10Libs: -L${libdir} -lector
11Libs.private: @requirements_libs_ector@ 11Libs.private: @requirements_libs_ector@
12Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/ector-@VMAJ@ 12Cflags:
diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am
index 912537531c..bbe1763b44 100644
--- a/src/Makefile_Ector.am
+++ b/src/Makefile_Ector.am
@@ -64,12 +64,7 @@ CLEANFILES += \
64ectoreolianfilesdir = $(datadir)/eolian/include/ector-@VMAJ@ 64ectoreolianfilesdir = $(datadir)/eolian/include/ector-@VMAJ@
65ectoreolianfiles_DATA = $(ector_eolian_files) 65ectoreolianfiles_DATA = $(ector_eolian_files)
66 66
67EXTRA_DIST += $(ectoreolianfiles_DATA) 67EXTRA_DIST += $(ectoreolianfiles_DATA) \
68
69lib_LTLIBRARIES += lib/ector/libector.la
70
71installed_ectormainheadersdir = $(includedir)/ector-@VMAJ@
72dist_installed_ectormainheaders_DATA = \
73lib/ector/Ector.h \ 68lib/ector/Ector.h \
74lib/ector/ector_util.h \ 69lib/ector/ector_util.h \
75lib/ector/ector_surface.h \ 70lib/ector/ector_surface.h \
@@ -79,6 +74,8 @@ lib/ector/cairo/Ector_Cairo.h \
79lib/ector/software/Ector_Software.h \ 74lib/ector/software/Ector_Software.h \
80lib/ector/gl/Ector_GL.h 75lib/ector/gl/Ector_GL.h
81 76
77lib_LTLIBRARIES += lib/ector/libector.la
78
82# And the generic implementation 79# And the generic implementation
83 80
84lib_ector_libector_la_SOURCES = \ 81lib_ector_libector_la_SOURCES = \
@@ -92,9 +89,6 @@ lib/ector/ector_renderer_generic_gradient.c \
92lib/ector/ector_renderer_generic_gradient_radial.c \ 89lib/ector/ector_renderer_generic_gradient_radial.c \
93lib/ector/ector_renderer_generic_gradient_linear.c 90lib/ector/ector_renderer_generic_gradient_linear.c
94 91
95installed_ectorgenericheadersdir = $(includedir)/ector-@VMAJ@/generic
96nodist_installed_ectorgenericheaders_DATA = $(ector_eolian_generic_h)
97
98# And now the cairo backend 92# And now the cairo backend
99lib_ector_libector_la_SOURCES += \ 93lib_ector_libector_la_SOURCES += \
100lib/ector/cairo/ector_renderer_cairo_gradient_linear.c \ 94lib/ector/cairo/ector_renderer_cairo_gradient_linear.c \
@@ -104,9 +98,6 @@ lib/ector/cairo/ector_renderer_cairo_base.c \
104lib/ector/cairo/ector_cairo_software_surface.c \ 98lib/ector/cairo/ector_cairo_software_surface.c \
105lib/ector/cairo/ector_cairo_surface.c 99lib/ector/cairo/ector_cairo_surface.c
106 100
107installed_ectorcairoheadersdir = $(includedir)/ector-@VMAJ@/cairo
108nodist_installed_ectorcairoheaders_DATA = $(ector_eolian_cairo_h)
109
110# SW draw static lib 101# SW draw static lib
111draw_sources = \ 102draw_sources = \
112static_libs/draw/draw_main_sse2.c \ 103static_libs/draw/draw_main_sse2.c \
@@ -152,12 +143,6 @@ lib/ector/gl/shader/ector_gl_shaders.x: $(GL_SHADERS_GEN)
152 @echo " SHADERS $@" 143 @echo " SHADERS $@"
153 @bash $(srcdir)/lib/ector/gl/shader/gen_shaders.sh 144 @bash $(srcdir)/lib/ector/gl/shader/gen_shaders.sh
154 145
155installed_ectorsoftwareheadersdir = $(includedir)/ector-@VMAJ@/software
156nodist_installed_ectorsoftwareheaders_DATA = $(ector_eolian_software_h)
157
158installed_ectorglheadersdir = $(includedir)/ector-@VMAJ@/gl
159nodist_installed_ectorglheaders_DATA = $(ector_eolian_gl_h)
160
161lib_ector_libector_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ 146lib_ector_libector_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
162-I$(top_builddir)/src/lib/ector \ 147-I$(top_builddir)/src/lib/ector \
163-I$(top_builddir)/src/lib/ector/cairo \ 148-I$(top_builddir)/src/lib/ector/cairo \