X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2FMakefile;h=d418f7553422e270b3da49f7f9ac41970b75234b;hb=bc2bbfcbe76e78db9cde27455ddbcfe1ddcc61d6;hp=acd93becb7675d1d5e41602e4067258cca7d0f5d;hpb=0192d9f3a127c82b32131d26ed9b5fb5a90db723;p=libucw.git

diff --git a/images/Makefile b/images/Makefile
index acd93bec..d418f755 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -15,9 +15,6 @@ else
 LIBIMAGES_DEPS=$(LIBUCW)
 endif
 
-ifdef CONFIG_STATIC_PIC
-LIBIMAGES_DEPS+=$(o)/images/libucw-images$(LV)-pic.a
-endif
 ifdef CONFIG_INSTALL_API
 $(o)/images/libucw-images.pc: $(addprefix $(o)/images/libucw-images$(LV),.a .so)
 endif
@@ -60,15 +57,14 @@ 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+=$(MAGICK_CPPFLAGS)
+LIBIMAGES_LIBS+=$(MAGICK_LIBS) -lpthread
+$(addprefix $(o)/images/io-libmagick,.o .oo): CFLAGS+=$(MAGICK_CPPFLAGS) -Wno-redundant-decls -Wno-undef
 endif
 
 PROGS+=$(LIBIMAGES_PROGS)
 CONFIGS+=$(LIBIMAGES_CONFIGS)
 
 $(o)/images/libucw-images$(LV).a: $(addsuffix .o,$(addprefix $(o)/images/,$(LIBIMAGES_MODS)))
-$(o)/images/libucw-images$(LV)-pic.a: $(addsuffix .oo,$(addprefix $(o)/images/,$(LIBIMAGES_MODS)))
 $(o)/images/libucw-images$(LV).so: $(addsuffix .oo,$(addprefix $(o)/images/,$(LIBIMAGES_MODS))) $(LIBIMAGES_DEPS)
 $(o)/images/libucw-images$(LV).so: SONAME_SUFFIX=.0
 $(o)/images/libucw-images$(LV).so: LIBS+=$(LIBIMAGES_LIBS)
@@ -81,10 +77,12 @@ $(o)/images/ucw-image-sim-test: $(o)/images/ucw-image-sim-test.o $(LIBIMAGES) $(
 
 TESTS+=$(o)/images/image-test.test
 $(o)/images/image-test: $(o)/images/image-test.o $(LIBIMAGES) $(LIBUCW)
+$(o)/images/image-test: LIBS+=-lpthread
 $(o)/images/image-test.test: $(o)/images/image-test
 
 TESTS+=$(o)/images/color.test
 $(o)/images/color-t: $(LIBIMAGES) $(LIBUCW)
+$(o)/images/color-t: LIBS+=-lm
 $(o)/images/color.test: $(o)/images/color-t
 
 API_LIBS+=libucw-images