From 2885d35311b58aaae76c2014d64394e2f29e6ae2 Mon Sep 17 00:00:00 2001 From: Santanu Sinha Date: Wed, 9 Sep 2009 12:55:44 +0530 Subject: [PATCH] Changes for faster build Redundant dependencies on sigcmm, cairomm, glibmm, giomm have been removed. All of these are automatically done with gtkmm. --- configure.ac | 4 ---- src/application/Makefile.am | 8 -------- src/attribute/Makefile.am | 2 -- src/common/Makefile.am | 2 -- src/database/Makefile.am | 2 -- src/edit-engine/Makefile.am | 6 +----- src/editor/Makefile.am | 2 -- src/exporter/Makefile.am | 6 +----- src/importer/Makefile.am | 4 ---- src/renderer/Makefile.am | 6 +----- src/storage/Makefile.am | 2 -- 11 files changed, 3 insertions(+), 41 deletions(-) diff --git a/configure.ac b/configure.ac index 7a6edf6..49b31b6 100644 --- a/configure.ac +++ b/configure.ac @@ -22,18 +22,14 @@ AM_GLIB_GNU_GETTEXT AM_PROG_LIBTOOL -PKG_CHECK_MODULES(CAIROMM, [cairomm-1.0]) PKG_CHECK_MODULES(EXIV2, [exiv2 >= 0.18]) PKG_CHECK_MODULES(FLICKCURL, [flickcurl]) PKG_CHECK_MODULES(GDAMM, [libgdamm-3.0 <= 3.0.1]) PKG_CHECK_MODULES(GDA_SQLITE, [libgda-sqlite-3.0]) PKG_CHECK_MODULES(GDL, [gdl-1.0]) -PKG_CHECK_MODULES(GIOMM, [giomm-2.4]) -PKG_CHECK_MODULES(GLIBMM, [glibmm-2.4]) PKG_CHECK_MODULES(GPHOTO2, [libgphoto2]) PKG_CHECK_MODULES(GTKIMAGEVIEW, [gtkimageview]) PKG_CHECK_MODULES(GTKMM, [gtkmm-2.4 >= 2.8]) -PKG_CHECK_MODULES(SIGC, [sigc++-2.0]) PKG_CHECK_MODULES(SOUP, [libsoup-2.4]) PKG_CHECK_MODULES(WEBKIT, [webkit-1.0]) PKG_CHECK_MODULES(BABL, [babl]) diff --git a/src/application/Makefile.am b/src/application/Makefile.am index cae52cf..0a6757a 100644 --- a/src/application/Makefile.am +++ b/src/application/Makefile.am @@ -31,13 +31,9 @@ solang_LDADD = \ $(GTKIMAGEVIEW_LIBS) \ $(WEBKIT_LIBS) \ $(GTKMM_LIBS) \ - $(CAIROMM_LIBS) \ $(GDAMM_LIBS) \ $(SOUP_LIBS) \ - $(GIOMM_LIBS) \ - $(GLIBMM_LIBS) \ $(GDL_LIBS) \ - $(SIGC_LIBS) \ $(BABL_LIBS) \ $(GEGL_LIBS) @@ -57,17 +53,13 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/renderer \ -I$(top_srcdir)/src/storage \ $(SOLANG_CFLAGS) \ - $(CAIROMM_CFLAGS) \ $(EXIV2_CFLAGS) \ $(FLICKCURL_CFLAGS) \ $(GPHOTO2_CFLAGS) \ $(GTKIMAGEVIEW_CFLAGS) \ $(GTKMM_CFLAGS) \ $(GDAMM_CFLAGS) \ - $(GIOMM_CFLAGS) \ - $(GLIBMM_CFLAGS) \ $(GDL_CFLAGS) \ - $(SIGC_CFLAGS) \ $(GEGL_CFLAGS) AM_CXXFLAGS = \ diff --git a/src/attribute/Makefile.am b/src/attribute/Makefile.am index 98b2c01..e526316 100644 --- a/src/attribute/Makefile.am +++ b/src/attribute/Makefile.am @@ -61,8 +61,6 @@ AM_CPPFLAGS = \ $(EXIV2_CFLAGS) \ $(GTKMM_CFLAGS) \ $(GDAMM_CFLAGS) \ - $(GIOMM_CFLAGS) \ - $(GLIBMM_CFLAGS) \ $(GDL_CFLAGS) \ $(LIBXML_CFLAGS) \ $(SIGC_CFLAGS) diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 58f75e9..6ccca8b 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -70,8 +70,6 @@ AM_CPPFLAGS = \ $(FLICKCURL_CFLAGS) \ $(GTKMM_CFLAGS) \ $(GDAMM_CFLAGS) \ - $(GIOMM_CFLAGS) \ - $(GLIBMM_CFLAGS) \ $(GDL_CFLAGS) \ $(GEGL_CFLAGS) \ $(BABL_CFLAGS) \ diff --git a/src/database/Makefile.am b/src/database/Makefile.am index fe51ecd..8332539 100644 --- a/src/database/Makefile.am +++ b/src/database/Makefile.am @@ -40,8 +40,6 @@ AM_CPPFLAGS = \ $(EXIV2_CFLAGS) \ $(GTKMM_CFLAGS) \ $(GDAMM_CFLAGS) \ - $(GIOMM_CFLAGS) \ - $(GLIBMM_CFLAGS) \ $(GDL_CFLAGS) \ $(IMAGEMAGICK_CFLAGS) \ $(SIGC_CFLAGS) diff --git a/src/edit-engine/Makefile.am b/src/edit-engine/Makefile.am index 08a0eb4..55e4fde 100644 --- a/src/edit-engine/Makefile.am +++ b/src/edit-engine/Makefile.am @@ -31,15 +31,11 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/edit-engine \ -I$(top_srcdir)/src/renderer \ $(SOLANG_CFLAGS) \ - $(CAIROMM_CFLAGS) \ $(EXIV2_CFLAGS) \ $(GTKMM_CFLAGS) \ $(GDAMM_CFLAGS) \ - $(GIOMM_CFLAGS) \ - $(GLIBMM_CFLAGS) \ $(GDL_CFLAGS) \ - $(GEGL_CFLAGS) \ - $(SIGC_CFLAGS) + $(GEGL_CFLAGS) AM_CXXFLAGS = \ -Wall diff --git a/src/editor/Makefile.am b/src/editor/Makefile.am index 8f78ac2..d453dae 100644 --- a/src/editor/Makefile.am +++ b/src/editor/Makefile.am @@ -58,8 +58,6 @@ AM_CPPFLAGS = \ $(EXIV2_CFLAGS) \ $(GTKMM_CFLAGS) \ $(GDAMM_CFLAGS) \ - $(GIOMM_CFLAGS) \ - $(GLIBMM_CFLAGS) \ $(GDL_CFLAGS) \ $(SIGC_CFLAGS) \ $(GEGL_CFLAGS) diff --git a/src/exporter/Makefile.am b/src/exporter/Makefile.am index 4367657..1aa19dc 100644 --- a/src/exporter/Makefile.am +++ b/src/exporter/Makefile.am @@ -24,14 +24,10 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/renderer \ -I$(top_srcdir)/src/storage \ $(SOLANG_CFLAGS) \ - $(CAIROMM_CFLAGS) \ $(EXIV2_CFLAGS) \ $(GTKMM_CFLAGS) \ $(GDAMM_CFLAGS) \ - $(GIOMM_CFLAGS) \ - $(GLIBMM_CFLAGS) \ - $(GDL_CFLAGS) \ - $(SIGC_CFLAGS) + $(GDL_CFLAGS) AM_CXXFLAGS = \ -Wall diff --git a/src/importer/Makefile.am b/src/importer/Makefile.am index d71e325..f3f12d6 100644 --- a/src/importer/Makefile.am +++ b/src/importer/Makefile.am @@ -42,16 +42,12 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/renderer \ -I$(top_srcdir)/src/storage \ $(SOLANG_CFLAGS) \ - $(CAIROMM_CFLAGS) \ $(EXIV2_CFLAGS) \ $(FLICKCURL_CFLAGS) \ $(GPHOTO2_CFLAGS) \ $(GTKMM_CFLAGS) \ $(GDAMM_CFLAGS) \ - $(GIOMM_CFLAGS) \ - $(GLIBMM_CFLAGS) \ $(GDL_CFLAGS) \ - $(SIGC_CFLAGS) \ $(SOUP_CFLAGS) \ $(WEBKIT_CFLAGS) diff --git a/src/renderer/Makefile.am b/src/renderer/Makefile.am index b398a24..6d09ea2 100644 --- a/src/renderer/Makefile.am +++ b/src/renderer/Makefile.am @@ -41,17 +41,13 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/renderer \ -I$(top_srcdir)/src/storage \ $(SOLANG_CFLAGS) \ - $(CAIROMM_CFLAGS) \ $(EXIV2_CFLAGS) \ $(GTKIMAGEVIEW_CFLAGS) \ $(GTKMM_CFLAGS) \ $(GDAMM_CFLAGS) \ - $(GIOMM_CFLAGS) \ - $(GLIBMM_CFLAGS) \ $(GDL_CFLAGS) \ $(BABL_CFLAGS) \ - $(GEGL_CFLAGS) \ - $(SIGC_CFLAGS) + $(GEGL_CFLAGS) AM_CXXFLAGS = \ -Wall diff --git a/src/storage/Makefile.am b/src/storage/Makefile.am index 9fd3750..13c506d 100644 --- a/src/storage/Makefile.am +++ b/src/storage/Makefile.am @@ -25,8 +25,6 @@ AM_CPPFLAGS = \ $(EXIV2_CFLAGS) \ $(GTKMM_CFLAGS) \ $(GDAMM_CFLAGS) \ - $(GIOMM_CFLAGS) \ - $(GLIBMM_CFLAGS) \ $(GDL_CFLAGS) \ $(SIGC_CFLAGS) -- 1.6.0.4