From 04cd223644f534d556f12e01fe1baa4e21b7cc1b Mon Sep 17 00:00:00 2001 From: Pavel Charvat Date: Mon, 11 Sep 2006 17:02:47 +0200 Subject: [PATCH] fixes in libimages Makefile --- images/Makefile | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/images/Makefile b/images/Makefile index ddb582ac..8b7efbdd 100644 --- a/images/Makefile +++ b/images/Makefile @@ -12,7 +12,10 @@ LIBIMAGES_MODS+=dup-init dup-cmp endif ifdef CONFIG_IMAGES_SIM PROGS+=$(o)/images/image-sim-test -LIBIMAGES_MODS+=sig-dump sig-init sig-seg sig-txt sig-cmp +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 @@ -69,17 +72,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-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 - -- 2.39.2