From 52a281fd2206e729519fa81ac1751f44aefbfecd Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Wed, 6 Jan 2016 16:43:46 +0900 Subject: [PATCH] Ector: Do not install any header file Also fix spelling in .pc file --- pc/ector.pc.in | 4 ++-- src/Makefile_Ector.am | 21 +++------------------ 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@ includedir=@includedir@ Name: ector -Description: Enlightenned retained mode drawing library +Description: Enlightened retained mode drawing library Requires.private: @requirements_pc_ector@ Version: @VERSION@ Libs: -L${libdir} -lector Libs.private: @requirements_libs_ector@ -Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/ector-@VMAJ@ +Cflags: 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 += \ ectoreolianfilesdir = $(datadir)/eolian/include/ector-@VMAJ@ ectoreolianfiles_DATA = $(ector_eolian_files) -EXTRA_DIST += $(ectoreolianfiles_DATA) - -lib_LTLIBRARIES += lib/ector/libector.la - -installed_ectormainheadersdir = $(includedir)/ector-@VMAJ@ -dist_installed_ectormainheaders_DATA = \ +EXTRA_DIST += $(ectoreolianfiles_DATA) \ lib/ector/Ector.h \ lib/ector/ector_util.h \ lib/ector/ector_surface.h \ @@ -79,6 +74,8 @@ lib/ector/cairo/Ector_Cairo.h \ lib/ector/software/Ector_Software.h \ lib/ector/gl/Ector_GL.h +lib_LTLIBRARIES += lib/ector/libector.la + # And the generic implementation lib_ector_libector_la_SOURCES = \ @@ -92,9 +89,6 @@ lib/ector/ector_renderer_generic_gradient.c \ lib/ector/ector_renderer_generic_gradient_radial.c \ lib/ector/ector_renderer_generic_gradient_linear.c -installed_ectorgenericheadersdir = $(includedir)/ector-@VMAJ@/generic -nodist_installed_ectorgenericheaders_DATA = $(ector_eolian_generic_h) - # And now the cairo backend lib_ector_libector_la_SOURCES += \ lib/ector/cairo/ector_renderer_cairo_gradient_linear.c \ @@ -104,9 +98,6 @@ lib/ector/cairo/ector_renderer_cairo_base.c \ lib/ector/cairo/ector_cairo_software_surface.c \ lib/ector/cairo/ector_cairo_surface.c -installed_ectorcairoheadersdir = $(includedir)/ector-@VMAJ@/cairo -nodist_installed_ectorcairoheaders_DATA = $(ector_eolian_cairo_h) - # SW draw static lib draw_sources = \ static_libs/draw/draw_main_sse2.c \ @@ -152,12 +143,6 @@ lib/ector/gl/shader/ector_gl_shaders.x: $(GL_SHADERS_GEN) @echo " SHADERS $@" @bash $(srcdir)/lib/ector/gl/shader/gen_shaders.sh -installed_ectorsoftwareheadersdir = $(includedir)/ector-@VMAJ@/software -nodist_installed_ectorsoftwareheaders_DATA = $(ector_eolian_software_h) - -installed_ectorglheadersdir = $(includedir)/ector-@VMAJ@/gl -nodist_installed_ectorglheaders_DATA = $(ector_eolian_gl_h) - lib_ector_libector_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_builddir)/src/lib/ector \ -I$(top_builddir)/src/lib/ector/cairo \