Stop linking widgets.o into the shared library.

[movit] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index a08005acdbe5c37620e617ab97832fd54ad25645..f15fabf29ec6508223cbfbede591e4559ce5beda 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,8 +6,8 @@ GTEST_DIR ?= /usr/src/gtest
 # strive towards having a rock-stable ABI, but at least the soversion will increase
 # whenever it breaks, so that you will not have silent failures, and distribution package
 # management can run its course.
-movit_ltversion = 2:3:0
-movit_version = 1.1.3
+movit_ltversion = 3:0:0
+movit_version = 1.2.0
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -42,7 +42,7 @@ LDFLAGS += -fprofile-arcs -ftest-coverage
 LDLIBS += -lgcov
 endif
 
-DEMO_OBJS=demo.o
+DEMO_OBJS=demo.o widgets.o
 
 # Inputs.
 TESTED_INPUTS = flat_input
@@ -89,7 +89,7 @@ EFFECTS = $(TESTED_EFFECTS) $(UNTESTED_EFFECTS)
 # Unit tests.
 TESTS=effect_chain_test fp16_test $(TESTED_INPUTS:=_test) $(TESTED_EFFECTS:=_test)
 
-LIB_OBJS=effect_util.o util.o widgets.o effect.o effect_chain.o init.o resource_pool.o fp16.o ycbcr.o $(INPUTS:=.o) $(EFFECTS:=.o)
+LIB_OBJS=effect_util.o util.o effect.o effect_chain.o init.o resource_pool.o fp16.o ycbcr.o $(INPUTS:=.o) $(EFFECTS:=.o)
 
 # Default target:
 all: libmovit.la $(TESTS)
@@ -165,10 +165,10 @@ HDRS = effect_chain.h effect_util.h effect.h input.h image_format.h init.h util.
 HDRS += $(INPUTS:=.h)
 HDRS += $(EFFECTS:=.h)
 
-SHADERS = vs.vert vs.130.vert vs.300es.vert
-SHADERS += header.frag header.130.frag header.300es.frag
-SHADERS += footer.frag footer.130.frag footer.300es.frag
-SHADERS += texture1d.frag texture1d.130.frag texture1d.300es.frag
+SHADERS = vs.vert vs.130.vert vs.150.vert vs.300es.vert
+SHADERS += header.130.frag header.150.frag header.300es.frag
+SHADERS += footer.frag identity.frag
+SHADERS += texture1d.130.frag texture1d.150.frag texture1d.300es.frag
 SHADERS += $(INPUTS:=.frag)
 SHADERS += $(EFFECTS:=.frag)
 SHADERS += highlight_cutoff_effect.frag