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

[colorize.git] / gui / Makefile.am

diff --git a/gui/Makefile.am b/gui/Makefile.am
index a2a3aa1..d9d8e78 100644 (file)
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -1,6 +1,8 @@
 AM_CPPFLAGS = -Wall -g $(STD_DEFINES_AND_INCLUDES) $(GTK_CFLAGS) $(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
+
+SUBDIRS = buttons
 
 if HAVE_WINDOWS
 AM_CPPFLAGS += -DHAVE_WINDOWS
@@ -18,11 +20,6 @@ bin_PROGRAMS = \
        colorize_gtk
 
 colorize_gtk_SOURCES = \
-       ../src/img.c \
-       ../src/yuv.c \
-       ../src/mark.c \
-       ../src/process.c \
-       ../src/settings.c \
        image.c \
        palette.c \
        timeline.c \
@@ -30,23 +27,19 @@ colorize_gtk_SOURCES = \
        diag_bc.c \
        diag_level.c \
        fill.c \
-       buttons/b_size_1.c buttons/b_size_3.c buttons/b_size_5.c buttons/b_size_9.c \
-       buttons/b_size_11.c buttons/b_size_19.c buttons/b_move.c buttons/b_pick.c \
-       buttons/b_zoomin.c buttons/b_zoomout.c \
-       buttons/b_highlight.c buttons/b_eye.c buttons/b_pal.c buttons/b_col.c \
-       buttons/b_bc.c buttons/b_preview.c buttons/b_flow.c buttons/b_fill.c \
-       buttons/b_mark.c \
        menu.c \
        toolbar.c \
        main.c
+
 if ENABLE_OPENCV
 colorize_gtk_SOURCES += \
-       diag_flow.c \
-       ../src/opticalflow.c
+       diag_flow.c
 endif
 
 colorize_gtk_LDADD = \
        $(COMMON_LA) $(GTK_LIBS) $(GRAPHICSMAGICK_LIBS) $(IMAGEMAGICK_LIBS) $(OPENCV_LIBS) \
+       ../src/libcommon.a \
+       buttons/libbuttons.a \
        ../lib/libcolorize.la \
        -lm -lpthread