X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2FMakefile;h=0b4b27de14e04ca9a936e0299942d5110fbe82e6;hb=26b9fc31aa816c2c5eaa2f5b10d8a988e4d11cf0;hp=b8b002204d58631eb791cf82ca00839765a67082;hpb=501776384dca3e264f25475f1526b1564f2c035a;p=libucw.git

diff --git a/images/Makefile b/images/Makefile
index b8b00220..0b4b27de 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -2,11 +2,23 @@
 
 DIRS+=images
 
-PROGS+=$(addprefix $(o)/images/,image-tool)
+PROGS+=$(o)/images/image-tool $(o)/images/color-tool
+CONFIGS+=images
+LIBIMAGES_MODS=math config context image scale color alpha io-main object
 
-LIBIMAGES_MODS=image scale color alpha io-main
-LIBIMAGES=$(o)/images/libimages.$(LS)
-LIBIMAGES_LIBS=
+ifdef CONFIG_IMAGES_DUP
+PROGS+=$(o)/images/image-dup-test
+LIBIMAGES_MODS+=dup-init dup-cmp
+endif
+ifdef CONFIG_IMAGES_SIM
+PROGS+=$(o)/images/image-sim-test
+LIBIMAGES_MODS+=sig-cmp
+endif
+ifneq ($(CONFIG_IMAGES_DUP)$(CONFIG_IMAGES_SIM),)
+LIBIMAGES_MODS+=sig-dump sig-init sig-seg sig-txt
+endif
+
+LIBIMAGES_LIBS=-lm -lpthread
 
 ifdef CONFIG_IMAGES_LIBJPEG
 LIBIMAGES_MODS+=io-libjpeg
@@ -42,6 +54,15 @@ $(o)/images/libimages.so: $(addsuffix .oo,$(addprefix $(o)/images/,$(LIBIMAGES_M
 $(o)/images/image-tool: $(o)/images/image-tool.o $(LIBIMAGES) $(LIBUCW)
 $(o)/images/image-tool: LIBS+=$(LIBIMAGES_LIBS)
 
+$(o)/images/color-tool: $(o)/images/color-tool.o $(LIBIMAGES) $(LIBUCW)
+$(o)/images/color-tool: LIBS+=$(LIBIMAGES_LIBS)
+
+$(o)/images/image-dup-test: $(o)/images/image-dup-test.o $(LIBIMAGES) $(LIBUCW)
+$(o)/images/image-dup-test: LIBS+=$(LIBIMAGES_LIBS)
+
+$(o)/images/image-sim-test: $(o)/images/image-sim-test.o $(LIBIMAGES) $(LIBUCW)
+$(o)/images/image-sim-test: LIBS+=$(LIBIMAGES_LIBS)
+
 TESTS+=$(o)/images/image-test.test
 $(o)/images/image-test: $(o)/images/image-test.o $(LIBIMAGES) $(LIBUCW)
 $(o)/images/image-test: LIBS+=$(LIBIMAGES_LIBS)
@@ -54,20 +75,3 @@ $(o)/images/hilbert-test.test: $(o)/images/hilbert-test
 TESTS+=$(o)/images/color.test
 $(o)/images/color-t: LIBS+=-lm
 $(o)/images/color.test: $(o)/images/color-t
-
-#$(o)/images/image-test: $(o)/images/image-test.o $(LIBIMAGES) $(LIBUCW)
-#$(o)/images/image-test: LIBS+=$(LIBIMAGES_LIBS)
-
-#$(o)/images/image-idx: $(o)/images/image-idx.o $(o)/images/image-obj.o $(o)/images/dup-cmp.o $(o)/indexer/iconfig.o $(o)/images/image-sig.o $(o)/images/kd-tree.o $(o)/images/color.o $(o)/images/image-io.o $(LIBSH) $(LIBLANG) $(LIBCHARSET)
-#$(o)/images/image-idx: LIBS+=-lGraphicsMagick -ljpeg -lpng
-
-# By :;DF
-#PROGS+=$(addprefix $(o)/images/,decomp)
-#
-#$(o)/images/block_info.o $(o)/images/block_info.oo: CFLAGS+=-I/usr/include/GraphicsMagick
-#$(o)/images/k_means.o $(o)/images/k_means.oo: CFLAGS+=-I/usr/include/GraphicsMagick
-#$(o)/images/decomp.o $(o)/images/decomp.oo: CFLAGS+=-I/usr/include/GraphicsMagick
-
-#$(o)/images/decomp: $(o)/images/decomp.o $(o)/images/block_info.o $(o)/images/k_means.o $(LIBSH) $(LIBLANG) $(LIBCHARSET)
-#$(o)/images/decomp: LIBS+=-lGraphicsMagick -ljpeg -lm
-