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

diff --git a/.gitignore b/.gitignore
index fbc7365..9f335f8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ missing
 *.o
 *.lo
 *.la
+*.a
 .deps
 .libs
 *.swp

diff --git a/configure.ac b/configure.ac
index 1ebefcc..deb91e3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -98,6 +98,7 @@ AC_OUTPUT(
     src/Makefile
     tools/Makefile
     gui/Makefile
+    gui/buttons/Makefile
     Makefile)
 
 AS_IF([test "x$have_windows" == xno],[AC_MSG_NOTICE( Compiling for Unix )],[AC_MSG_NOTICE([ Compiling for Windows ])])

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
 

diff --git a/gui/buttons/Makefile.am b/gui/buttons/Makefile.am
new file mode 100644 (file)
index 0000000..9c89ed6
--- /dev/null
+++ b/gui/buttons/Makefile.am
@@ -0,0 +1,27 @@
+AM_CPPFLAGS = -Wall -g $(STD_DEFINES_AND_INCLUDES) $(GTK_CFLAGS)
+
+AM_CPPFLAGS += $(all_includes) # -I$(top_srcdir)/include -I$(top_builddir)/include
+
+noinst_LIBRARIES = libbuttons.a
+
+libbuttons_a_SOURCES = \
+       b_size_1.c \
+       b_size_3.c \
+       b_size_5.c \
+       b_size_9.c \
+       b_size_11.c \
+       b_size_19.c \
+       b_move.c \
+       b_pick.c \
+       b_zoomin.c \
+       b_zoomout.c \
+       b_highlight.c \
+       b_eye.c \
+       b_pal.c \
+       b_col.c \
+       b_bc.c \
+       b_preview.c \
+       b_flow.c \
+       b_fill.c \
+       b_mark.c
+

diff --git a/lib/Makefile.am b/lib/Makefile.am
index f45e7b0..90e4e52 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -Wall -g $(STD_DEFINES_AND_INCLUDES)
 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
 
 lib_LTLIBRARIES = libcolorize.la
 

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

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