X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2FMakefile;h=3283e44b3f499c51dc426c2c7108b5877ff98ae6;hb=956f5794fc8dad3ed98095f578cddbfe342f8db2;hp=412d959cb0353b42eeb71ce4f2461b995311bac1;hpb=cf642e7a8a8db28fd343ddebc1a5b852beff6153;p=libucw.git

diff --git a/images/Makefile b/images/Makefile
index 412d959c..3283e44b 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -2,32 +2,40 @@
 
 DIRS+=images
 
-PROGS+=$(addprefix $(o)/images/,image-tool)
+PROGS+=$(addprefix $(o)/images/,image-tool image-dup-test image-sim-test)
 
-LIBIMAGES_MODS=image scale io-main
-LIBIMAGES=$(o)/images/libimages.$(LS)
-LIBIMAGES_LIBS=
+CONFIGS+=images
 
-ifdef CONFIG_LIBJPEG
+LIBIMAGES_MODS=math config image scale color alpha io-main dup-init dup-cmp sig-dump sig-init sig-seg sig-cmp object
+
+LIBIMAGES_LIBS=-lm
+
+ifdef CONFIG_IMAGES_LIBJPEG
 LIBIMAGES_MODS+=io-libjpeg
 LIBIMAGES_LIBS+=-ljpeg
 endif
 
-ifdef CONFIG_LIBPNG
+ifdef CONFIG_IMAGES_LIBPNG
 LIBIMAGES_MODS+=io-libpng
 LIBIMAGES_LIBS+=-lpng
 endif
 
-ifdef CONFIG_LIBUNGIF
+ifdef CONFIG_IMAGES_LIBUNGIF
 LIBIMAGES_MODS+=io-libungif
 LIBIMAGES_LIBS+=-lungif
+else
+ifdef CONFIG_IMAGES_LIBGIF
+LIBIMAGES_MODS+=io-libungif
+LIBIMAGES_LIBS+=-lgif
+endif
 endif
 
-ifdef CONFIG_LIBMAGICK
+ifdef CONFIG_IMAGES_LIBMAGICK
 LIBIMAGES_MODS+=io-libmagick
 MAGICK_LIBS:=$(shell GraphicsMagick-config --libs)
+MAGICK_CPPFLAGS:=$(shell GraphicsMagick-config --cppflags)
 LIBIMAGES_LIBS+=$(MAGICK_LIBS)
-$(o)/images/io-libmagick.o: CFLAGS+=-I/usr/include/GraphicsMagick
+$(o)/images/io-libmagick.o: CFLAGS+=$(MAGICK_CPPFLAGS)
 endif
 
 $(o)/images/libimages.a: $(addsuffix .o,$(addprefix $(o)/images/,$(LIBIMAGES_MODS)))
@@ -36,22 +44,28 @@ $(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/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)
+$(o)/images/image-test.test: $(o)/images/image-test
+
 TESTS+=$(o)/images/hilbert-test.test
 $(o)/images/hilbert-test: LIBS+=-lm $(LIBSH)
 $(o)/images/hilbert-test.test: $(o)/images/hilbert-test
 
-#$(o)/images/image-test: $(o)/images/image-test.o $(LIBIMAGES) $(LIBUCW)
-#$(o)/images/image-test: LIBS+=$(LIBIMAGES_LIBS)
+TESTS+=$(o)/images/color.test
+$(o)/images/color-t: LIBS+=-lm
+$(o)/images/color.test: $(o)/images/color-t
 
-#$(o)/images/image-sig.o $(o)/images/image-sig.oo: CFLAGS+=-I/usr/include/GraphicsMagick
-#$(o)/images/image-idx.o $(o)/images/image-idx.oo: CFLAGS+=-I/usr/include/GraphicsMagick
-#$(o)/images/image-obj.o $(o)/images/image-obj.oo: CFLAGS+=-I/usr/include/GraphicsMagick
 #$(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
 
-#$(o)/images/color-t: LIBS+=-lm
-#$(o)/images/color.test: $(o)/images/color-t
-
 # By :;DF
 #PROGS+=$(addprefix $(o)/images/,decomp)
 #