ector: variable in _SOURCES do not work.
authorCedric BAIL <cedric@osg.samsung.com>
Fri, 3 Jun 2016 18:10:27 +0000 (11:10 -0700)
committerCedric BAIL <cedric@osg.samsung.com>
Fri, 3 Jun 2016 18:10:27 +0000 (11:10 -0700)
This fix the left over etc .deps during make distcheck.

src/Makefile_Ector.am
src/lib/ector/Makefile.am

index a4f874a..33c3bfd 100644 (file)
@@ -101,15 +101,14 @@ lib/ector/cairo/ector_cairo_software_surface.c \
 lib/ector/cairo/ector_cairo_surface.c
 
 # SW draw static lib
-draw_sources = \
+lib_ector_libector_la_SOURCES += \
 static_libs/draw/draw_main_sse2.c \
 static_libs/draw/draw_main.c \
 static_libs/draw/draw_main_neon.c \
 static_libs/rg_etc/rg_etc1.c \
 static_libs/rg_etc/rg_etc2.c \
 static_libs/rg_etc/rg_etc1.h \
-static_libs/rg_etc/etc2_encoder.c \
-$(NULL)
+static_libs/rg_etc/etc2_encoder.c
 
 # And the default software backend
 lib_ector_libector_la_SOURCES += \
@@ -123,8 +122,7 @@ lib/ector/software/ector_software_surface.c \
 lib/ector/software/ector_software_buffer.c \
 static_libs/freetype/sw_ft_math.c \
 static_libs/freetype/sw_ft_raster.c \
-static_libs/freetype/sw_ft_stroker.c \
-$(draw_sources)
+static_libs/freetype/sw_ft_stroker.c
 
 # And now the gl backend
 lib_ector_libector_la_SOURCES += \
index 96e3a18..158760e 100644 (file)
@@ -90,15 +90,14 @@ cairo/ector_cairo_software_surface.c \
 cairo/ector_cairo_surface.c
 
 # SW draw static lib
-draw_sources = \
+libector_la_SOURCES += \
 ../../static_libs/draw/draw_main_sse2.c \
 ../../static_libs/draw/draw_main.c \
 ../../static_libs/draw/draw_main_neon.c \
-static_libs/rg_etc/rg_etc1.c \
-static_libs/rg_etc/rg_etc2.c \
-static_libs/rg_etc/rg_etc1.h \
-static_libs/rg_etc/etc2_encoder.c \
-$(NULL)
+../../static_libs/rg_etc/rg_etc1.c \
+../../static_libs/rg_etc/rg_etc2.c \
+../../static_libs/rg_etc/rg_etc1.h \
+../../static_libs/rg_etc/etc2_encoder.c
 
 # And the default software backend
 libector_la_SOURCES += \
@@ -112,8 +111,7 @@ software/ector_software_surface.c \
 software/ector_software_buffer.c \
 ../../static_libs/freetype/sw_ft_math.c \
 ../../static_libs/freetype/sw_ft_raster.c \
-../../static_libs/freetype/sw_ft_stroker.c \
-$(draw_sources)
+../../static_libs/freetype/sw_ft_stroker.c
 
 # And now the gl backend
 libector_la_SOURCES += \