Fixes of configure.ac / Makefile.am for current autoconf

[colorize.git] / tools / Makefile.am

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4c221b3..e16897d 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -Wall -g $(STD_DEFINES_AND_INCLUDES) $(GRAPHICSMAGICK_CFLAGS) $(IMAGEMAGICK_CFLAGS) $(OPENCV_CFLAGS)
 
-INCLUDES = $(all_includes) # -I$(top_srcdir)/include -I$(top_builddir)/include
+AM_CPPFLAGS += $(all_includes) # -I$(top_srcdir)/include -I$(top_builddir)/include
 
 if ENABLE_MAGICK
 AM_CPPFLAGS += -DWITH_MAGICK
@@ -14,16 +14,18 @@ bin_PROGRAMS += rerate
 endif
 
 fields_SOURCES = \
-       ../src/img.c \
        fields.c
+
 fields_LDADD = \
+       ../src/libcommon.a \
        $(COMMON_LA) $(GRAPHICSMAGICK_LIBS) $(IMAGEMAGICK_LIBS)
 
 if ENABLE_MAGICK
 rerate_SOURCES = \
-       ../src/img.c \
        rerate.c
+
 rerate_LDADD = \
+       ../src/libcommon.a \
        $(COMMON_LA) $(GRAPHICSMAGICK_LIBS) $(IMAGEMAGICK_LIBS) $(OPENCV_LIBS) \
        -lm
 endif