-OBJS += lift_gamma_gain_effect.o
-OBJS += gamma_expansion_effect.o
-OBJS += gamma_compression_effect.o
-OBJS += colorspace_conversion_effect.o
-OBJS += saturation_effect.o
-OBJS += vignette_effect.o
-OBJS += mirror_effect.o
-OBJS += blur_effect.o
-OBJS += diffusion_effect.o
-OBJS += glow_effect.o
-OBJS += mix_effect.o
-OBJS += sandbox_effect.o
-
-test: $(OBJS)
- $(CXX) -o test $(OBJS) $(LDFLAGS)
+LIB_OBJS += lift_gamma_gain_effect.o
+LIB_OBJS += white_balance_effect.o
+LIB_OBJS += gamma_expansion_effect.o
+LIB_OBJS += gamma_compression_effect.o
+LIB_OBJS += colorspace_conversion_effect.o
+LIB_OBJS += alpha_multiplication_effect.o
+LIB_OBJS += alpha_division_effect.o
+LIB_OBJS += saturation_effect.o
+LIB_OBJS += vignette_effect.o
+LIB_OBJS += mirror_effect.o
+LIB_OBJS += blur_effect.o
+LIB_OBJS += diffusion_effect.o
+LIB_OBJS += glow_effect.o
+LIB_OBJS += unsharp_mask_effect.o
+LIB_OBJS += mix_effect.o
+LIB_OBJS += overlay_effect.o
+LIB_OBJS += resize_effect.o
+LIB_OBJS += padding_effect.o
+LIB_OBJS += resample_effect.o
+LIB_OBJS += dither_effect.o
+LIB_OBJS += deconvolution_sharpen_effect.o
+LIB_OBJS += sandbox_effect.o
+
+# Default target:
+all: $(TESTS) demo
+
+# Google Test and other test library functions.
+TEST_OBJS = gtest-all.o gtest_sdl_main.o test_util.o
+
+gtest-all.o: $(GTEST_DIR)/src/gtest-all.cc
+ $(CXX) -MMD $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c $< -o $@
+gtest_sdl_main.o: gtest_sdl_main.cpp
+ $(CXX) -MMD $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c $< -o $@
+
+# Unit tests.
+$(TESTS): %: %.o $(TEST_OBJS) libmovit.a
+ $(CXX) -o $@ $^ $(LDFLAGS)
+
+OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(TEST_OBJS) $(TESTS:=.o)
+
+# A small demo program.
+demo: libmovit.a $(DEMO_OBJS)
+ $(CXX) -o demo $(DEMO_OBJS) libmovit.a $(LDFLAGS)
+
+# The library itself.
+libmovit.a: $(LIB_OBJS)
+ $(AR) rc $@ $(LIB_OBJS)
+ $(RANLIB) $@