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

[colorize.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index bb2b45e..832c99f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -Wall -g $(STD_DEFINES_AND_INCLUDES)  $(GRAPHICSMAGICK_CFLAGS) $(IMAGEMAGICK_CFLAGS) $(OPENCV_CFLAGS)
 AM_CXXFLAGS = -Wall -g
 
-INCLUDES = $(all_includes) # -I$(top_srcdir)/include -I$(top_builddir)/include
+AM_CPPFLAGS += $(all_includes) # -I$(top_srcdir)/include -I$(top_builddir)/include
 
 if HAVE_WINDOWS
 AM_CPPFLAGS += -DHAVE_WINDOWS
@@ -15,21 +15,28 @@ if ENABLE_OPENCV
 AM_CPPFLAGS += -DWITH_OPENCV
 endif
 
+noinst_LIBRARIES = libcommon.a
+
 bin_PROGRAMS = \
        colorize
 
-colorize_SOURCES = \
-       colorize.c \
+libcommon_a_SOURCES = \
        settings.c \
        process.c \
        img.c \
        yuv.c \
        mark.c
+
 if ENABLE_OPENCV
-colorize_SOURCES += \
+libcommon_a_SOURCES += \
        opticalflow.c
 endif
+
+colorize_SOURCES = \
+       colorize.c
+
 colorize_LDADD = \
+       libcommon.a \
        ../lib/libcolorize.la \
        $(COMMON_LA) $(GRAPHICSMAGICK_LIBS) $(IMAGEMAGICK_LIBS) $(OPENCV_LIBS) \
        -lm