[niepce] Refactor framework flags.
- From: Hubert Figuière <hub src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [niepce] Refactor framework flags.
- Date: Sat, 12 Jul 2014 17:01:37 +0000 (UTC)
commit f74689392ba3d55dd1773e09abee59781f39b91c
Author: Hubert Figuière <hub figuiere net>
Date: Mon Jul 7 20:34:47 2014 -0400
Refactor framework flags.
camerawire/src/Makefile.am | 4 ++--
configure.ac | 16 +++++-----------
magellan/src/Makefile.am | 4 ++--
src/engine/db/Makefile.am | 6 ++----
src/engine/library/Makefile.am | 8 ++++----
src/ext/libview/Makefile.am | 2 +-
src/fwk/base/Makefile.am | 14 +++++++-------
src/fwk/toolkit/Makefile.am | 6 ++----
src/fwk/utils/Makefile.am | 27 +++++++++++----------------
src/libraryclient/Makefile.am | 7 +++----
src/ncr/Makefile.am | 2 +-
src/niepce/Makefile.am | 8 +++-----
src/niepce/modules/darkroom/Makefile.am | 5 ++---
src/niepce/modules/interfaces/Makefile.am | 5 +----
src/niepce/ui/Makefile.am | 4 +---
15 files changed, 47 insertions(+), 71 deletions(-)
---
diff --git a/camerawire/src/Makefile.am b/camerawire/src/Makefile.am
index ac0a950..1a8fba9 100644
--- a/camerawire/src/Makefile.am
+++ b/camerawire/src/Makefile.am
@@ -3,7 +3,7 @@
AM_CPPFLAGS = -DCW_LOCALEDIR=\"${CW_LOCALEDIR}\" \
-DDATADIR=\"$(datadir)\" \
-I$(top_srcdir)/src \
- @LIBGLIBMM_CFLAGS@ @LIBGTKMM_CFLAGS@ \
+ @FRAMEWORK_CFLAGS@ \
@GPHOTO_CFLAGS@
bin_PROGRAMS = camerawire
@@ -13,7 +13,7 @@ camerawire_SOURCES = \
cwwindow.hpp cwwindow.cpp \
main.cpp
-camerawire_LDADD = @LIBGLIBMM_LIBS@ @LIBGTKMM_LIBS@ \
+camerawire_LDADD = @FRAMEWORK_LIBS@ \
@GPHOTO_LIBS@ \
$(top_builddir)/src/fwk/toolkit/libniepceframework.a \
$(top_builddir)/src/fwk/utils/libniepceutils.a \
diff --git a/configure.ac b/configure.ac
index d6d4757..8a4ab2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,22 +97,16 @@ AC_PROG_LIBTOOL
AC_LANG_CPLUSPLUS
AC_LANG_COMPILER_REQUIRE
-PKG_CHECK_MODULES(LIBGLIBMM, [glibmm-2.4 >= $LIBGLIBMM_VERSION giomm-2.4 >= $LIBGIOMM_VERSION gthread-2.0])
-PKG_CHECK_MODULES(LIBGTKMM, [gtkmm-3.0 >= $LIBGTKMM_VERSION])
-PKG_CHECK_MODULES(SQLITE3, [sqlite3 >= $SQLITE_VERSION])
-PKG_CHECK_MODULES(EXEMPI, [exempi-2.0 >= $EXEMPI_VERSION])
-PKG_CHECK_MODULES(LIBXML2, [libxml-2.0 >= $LIBXML2_VERSION])
-PKG_CHECK_MODULES(BABL, babl)
+dnl Framework requirements.
+PKG_CHECK_MODULES(FRAMEWORK, [glibmm-2.4 >= $LIBGLIBMM_VERSION giomm-2.4 >= $LIBGIOMM_VERSION gthread-2.0
gtkmm-3.0 >= $LIBGTKMM_VERSION sqlite3 >= $SQLITE_VERSION exempi-2.0 >= $EXEMPI_VERSION libxml-2.0 >=
$LIBXML2_VERSION])
+
+dnl optional framework
PKG_CHECK_MODULES(GPHOTO, [libgphoto2 >= $LIBGPHOTO_VERSION libgphoto2_port])
dnl niepce
+PKG_CHECK_MODULES(BABL, babl)
PKG_CHECK_MODULES(OPENRAW, libopenraw-gnome-1.0 >= $LIBOPENRAW_VERSION)
-AC_SUBST(OPENRAW_CFLAGS)
-AC_SUBST(OPENRAW_LIBS)
-
PKG_CHECK_MODULES(GEGL, gegl-0.2 >= $GEGL_VERSION)
-AC_SUBST(GEGL_CFLAGS)
-AC_SUBST(GEGL_LIBS)
BOOST_REQUIRE([$BOOST_VERSION])
BOOST_CONVERSION
diff --git a/magellan/src/Makefile.am b/magellan/src/Makefile.am
index 796a40e..6f81eba 100644
--- a/magellan/src/Makefile.am
+++ b/magellan/src/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = -DMG_LOCALEDIR=\"${MG_LOCALEDIR}\" \
-DDATADIR=\"$(datadir)\" \
-DGLADEDIR=\"$(gladedir)\" \
-I$(top_srcdir)/src \
- @LIBGLIBMM_CFLAGS@ @LIBGTKMM_CFLAGS@
+ @FRAMEWORK_CFLAGS@
gladefiles = mgwindow.ui
gladedir = @datarootdir@/niepce/glade/
@@ -18,7 +18,7 @@ magellan_SOURCES = \
main.cpp
-magellan_LDADD = @LIBGLIBMM_LIBS@ @LIBGTKMM_LIBS@ \
+magellan_LDADD = @FRAMEWORK_LIBS@ \
$(top_builddir)/src/fwk/toolkit/libniepceframework.a \
$(top_builddir)/src/fwk/utils/libniepceutils.a \
$(top_builddir)/src/fwk/base/libfwkbase.a \
diff --git a/src/engine/db/Makefile.am b/src/engine/db/Makefile.am
index 41a2052..e762dd9 100644
--- a/src/engine/db/Makefile.am
+++ b/src/engine/db/Makefile.am
@@ -2,7 +2,7 @@
SUBDIRS =
-AM_CPPFLAGS = -I$(top_srcdir)/src/ @EXEMPI_CFLAGS@ @LIBGLIBMM_CFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/src/ @FRAMEWORK_CFLAGS@
TESTS = test_library test_filebundle
@@ -11,10 +11,8 @@ TEST_LIBS = \
$(top_builddir)/src/fwk/utils/libniepceutils.a \
$(top_builddir)/src/fwk/toolkit/libniepceframework.a \
$(top_builddir)/src/fwk/base/libfwkbase.a \
- @LIBGTKMM_LIBS@ \
@BOOST_UNIT_TEST_FRAMEWORK_LIBS@ \
- @LIBGLIBMM_LIBS@ \
- @SQLITE3_LIBS@ @EXEMPI_LIBS@
+ @FRAMEWORK_LIBS@
check_PROGRAMS = test_library test_filebundle
diff --git a/src/engine/library/Makefile.am b/src/engine/library/Makefile.am
index 56c95b9..5338c14 100644
--- a/src/engine/library/Makefile.am
+++ b/src/engine/library/Makefile.am
@@ -1,8 +1,8 @@
AM_CPPFLAGS = -I$(top_srcdir)/src/ \
- @LIBGLIBMM_CFLAGS@ @LIBGTKMM_CFLAGS@ \
- @OPENRAW_CFLAGS@ @EXEMPI_CFLAGS@
+ @FRAMEWORK_CFLAGS@ \
+ @OPENRAW_CFLAGS@
check_PROGRAMS = test_opqueue
TESTS = test_opqueue
@@ -12,8 +12,8 @@ TEST_LIBS = \
$(top_builddir)/src/fwk/utils/libniepceutils.a \
$(top_builddir)/src/fwk/toolkit/libniepceframework.a \
@BOOST_UNIT_TEST_FRAMEWORK_LIBS@ \
- @LIBGLIBMM_LIBS@ \
- @LIBGTKMM_LIBS@ @SQLITE3_LIBS@ @OPENRAW_LIBS@
+ @FRAMEWORK_LIBS@ \
+ @OPENRAW_LIBS@
noinst_LIBRARIES = libniepcelibrary.a
diff --git a/src/ext/libview/Makefile.am b/src/ext/libview/Makefile.am
index fe889af..dd2e52f 100644
--- a/src/ext/libview/Makefile.am
+++ b/src/ext/libview/Makefile.am
@@ -1,6 +1,6 @@
-AM_CPPFLAGS = -I$(top_srcdir)/src/ext/ @LIBGTKMM_CFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/src/ext/ @FRAMEWORK_CFLAGS@
noinst_LIBRARIES = libview.a
diff --git a/src/fwk/base/Makefile.am b/src/fwk/base/Makefile.am
index 8995ab2..4015ac4 100644
--- a/src/fwk/base/Makefile.am
+++ b/src/fwk/base/Makefile.am
@@ -1,7 +1,7 @@
AM_CPPFLAGS = -I$(top_srcdir)/src \
@BOOST_CPPFLAGS@ \
- @EXEMPI_CFLAGS@ \
+ @FRAMEWORK_CFLAGS@ \
$(NULL)
noinst_LIBRARIES = libfwkbase.a
@@ -15,27 +15,27 @@ check_PROGRAMS = testmoniker testgeometry testfractions testdate testmap\
testdate_SOURCES = t/testdate.cpp
testdate_LDADD = libfwkbase.a \
- @LIBGLIBMM_LIBS@
+ @FRAMEWORK_LIBS@
testmoniker_SOURCES = t/testmoniker.cpp
testmoniker_LDADD = libfwkbase.a \
- @LIBGLIBMM_LIBS@
+ @FRAMEWORK_LIBS@
testgeometry_SOURCES = t/testgeometry.cpp
testgeometry_LDADD = libfwkbase.a \
- @LIBGLIBMM_LIBS@
+ @FRAMEWORK_LIBS@
testfractions_SOURCES = t/testfractions.cpp
testfractions_LDADD = libfwkbase.a \
- @LIBGLIBMM_LIBS@
+ @FRAMEWORK_LIBS@
testmap_SOURCES = t/testmap.cpp
testmap_LDADD = libfwkbase.a \
- @LIBGLIBMM_LIBS@
+ @FRAMEWORK_LIBS@
testpropertybag_SOURCES = t/testpropertybag.cpp
testpropertybag_LDADD = libfwkbase.a \
- @LIBGLIBMM_LIBS@
+ @FRAMEWORK_LIBS@
libfwkbase_a_SOURCES = colour.hpp colour.cpp \
autoflag.hpp \
diff --git a/src/fwk/toolkit/Makefile.am b/src/fwk/toolkit/Makefile.am
index d49e806..e653a75 100644
--- a/src/fwk/toolkit/Makefile.am
+++ b/src/fwk/toolkit/Makefile.am
@@ -4,9 +4,7 @@
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/ext \
-DDATADIR=\"$(datadir)\" \
- @LIBGLIBMM_CFLAGS@ \
- @LIBGTKMM_CFLAGS@ \
- @EXEMPI_CFLAGS@ \
+ @FRAMEWORK_CFLAGS@ \
$(NULL)
noinst_LIBRARIES = libniepceframework.a
@@ -22,7 +20,7 @@ testconfigdatabinder_SOURCES = t/testconfigdatabinder.cpp
testconfigdatabinder_LDADD = libniepceframework.a \
../base/libfwkbase.a \
../utils/libniepceutils.a \
- @LIBGLIBMM_LIBS@
+ @FRAMEWORK_LIBS@
libniepceframework_a_SOURCES = configuration.hpp configuration.cpp \
diff --git a/src/fwk/utils/Makefile.am b/src/fwk/utils/Makefile.am
index 1fe56a6..0965843 100644
--- a/src/fwk/utils/Makefile.am
+++ b/src/fwk/utils/Makefile.am
@@ -1,8 +1,8 @@
DIST_SUBDIRS = db
-AM_CPPFLAGS = -I$(top_srcdir)/src/ @LIBGLIBMM_CFLAGS@ \
- @EXEMPI_CFLAGS@ @LIBXML2_CFLAGS@ @GPHOTO_CFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/src/ \
+ @FRAMEWORK_CFLAGS@ @GPHOTO_CFLAGS@
TESTS = testfiles testxmp \
testpathutils \
@@ -18,52 +18,47 @@ check_PROGRAMS = testfiles testxmp \
testfiles_SOURCES = testfiles.cpp
testfiles_LDADD = libniepceutils.a \
../base/libfwkbase.a \
- @LIBGLIBMM_LIBS@
+ @FRAMEWORK_LIBS@
testxmp_SOURCES = testxmp.cpp
testxmp_LDADD = libniepceutils.a \
../base/libfwkbase.a \
- @EXEMPI_LIBS@ @LIBGLIBMM_LIBS@
+ @FRAMEWORK_LIBS@
testufrawmeta_SOURCES = testufrawmeta.cpp
testufrawmeta_CXXFLAGS = -g -O0
testufrawmeta_LDADD = libniepceutils.a \
../base/libfwkbase.a \
- @EXEMPI_LIBS@ @LIBXML2_LIBS@ \
- @LIBGLIBMM_LIBS@
+ @FRAMEWORK_LIBS@
teststringutils_SOURCES = teststringutils.cpp
-teststringutils_LDADD =
+teststringutils_LDADD =
testpathutils_SOURCES = t/testpathutils.cpp
testpathutils_LDADD = libniepceutils.a \
- @LIBGLIBMM_LIBS@
+ @FRAMEWORK_LIBS@
test_db_SOURCES = db/test_db.cpp
test_db_LDADD = libniepceutils.a \
../base/libfwkbase.a \
- @LIBGLIBMM_LIBS \
- @SQLITE3_LIBS@
+ @FRAMEWORK_LIBS@
test_db2_SOURCES = db/test_db2.cpp
test_db2_LDADD = libniepceutils.a \
../base/libfwkbase.a \
- @LIBGLIBMM_LIBS \
- @SQLITE3_LIBS@
+ @FRAMEWORK_LIBS@
test_db3_SOURCES = db/test_db3.cpp
test_db3_LDADD = libniepceutils.a \
../base/libfwkbase.a \
- @LIBGLIBMM_LIBS \
- @SQLITE3_LIBS@
+ @FRAMEWORK_LIBS@
test_db4_SOURCES = db/test_db4.cpp
test_db4_LDADD = libniepceutils.a \
../base/libfwkbase.a \
- @LIBGLIBMM_LIBS \
- @SQLITE3_LIBS@
+ @FRAMEWORK_LIBS@
noinst_LIBRARIES = libniepceutils.a
diff --git a/src/libraryclient/Makefile.am b/src/libraryclient/Makefile.am
index a9dd336..323da78 100644
--- a/src/libraryclient/Makefile.am
+++ b/src/libraryclient/Makefile.am
@@ -1,6 +1,6 @@
-AM_CPPFLAGS = -I$(top_srcdir)/src @EXEMPI_CFLAGS@ @LIBGLIBMM_CFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/src @FRAMEWORK_CFLAGS@
noinst_LIBRARIES = liblibraryclient.a
@@ -14,9 +14,8 @@ TEST_LIBS = \
$(top_builddir)/src/fwk/toolkit/libniepceframework.a \
$(top_builddir)/src/fwk/base/libfwkbase.a \
@BOOST_UNIT_TEST_FRAMEWORK_LIBS@ \
- @LIBGLIBMM_LIBS@ \
- @LIBGTKMM_LIBS@ @SQLITE3_LIBS@ @OPENRAW_LIBS@ \
- @EXEMPI_LIBS@
+ @FRAMEWORK_LIBS@ \
+ @OPENRAW_LIBS@
test_worker_SOURCES = test_worker.cpp
test_worker_LDADD = $(TEST_LIBS)
diff --git a/src/ncr/Makefile.am b/src/ncr/Makefile.am
index 70200fd..6afe9d8 100644
--- a/src/ncr/Makefile.am
+++ b/src/ncr/Makefile.am
@@ -2,7 +2,7 @@
AM_CPPFLAGS = -I$(top_srcdir)/src \
- @LIBGTKMM_CFLAGS@ \
+ @FRAMEWORK_CFLAGS@ \
@BABL_CFLAGS@ @GEGL_CFLAGS@ @OPENRAW_CFLAGS@
niepcelibdir = @libdir@/niepce/
diff --git a/src/niepce/Makefile.am b/src/niepce/Makefile.am
index ca0fba4..34d69ec 100644
--- a/src/niepce/Makefile.am
+++ b/src/niepce/Makefile.am
@@ -3,8 +3,7 @@ SUBDIRS = ui modules
AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \
-I$(top_srcdir)/src/niepce -I$(top_srcdir)/src \
- @EXEMPI_CFLAGS@ @LIBGLIBMM_CFLAGS@ \
- @LIBGTKMM_CFLAGS@ \
+ @FRAMEWORK_CFLAGS@ \
-DNIEPCE_LOCALEDIR=\"@NIEPCE_LOCALEDIR \"
bin_PROGRAMS = niepce
@@ -24,10 +23,9 @@ niepce_LDADD = \
$(top_builddir)/src/fwk/base/libfwkbase.a \
$(top_builddir)/src/ncr/libncr.a \
$(top_builddir)/src/ext/libview/libview.a \
- @LIBGLIBMM_LIBS@ \
- @LIBGTKMM_LIBS@ @SQLITE3_LIBS@ \
+ @FRAMEWORK_LIBS@ \
@BABL_LIBS@ \
- @GEGL_LIBS@ @OPENRAW_LIBS@ @EXEMPI_LIBS@
+ @GEGL_LIBS@ @OPENRAW_LIBS@
niepce_SOURCES = \
diff --git a/src/niepce/modules/darkroom/Makefile.am b/src/niepce/modules/darkroom/Makefile.am
index 7e57f59..cffe620 100644
--- a/src/niepce/modules/darkroom/Makefile.am
+++ b/src/niepce/modules/darkroom/Makefile.am
@@ -4,9 +4,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/niepce \
-I$(top_srcdir)/src/ext \
-DGLADEDIR=\"$(gladedir)\" \
-DDATADIR=\"$(datadir)\" \
- @LIBGLIBMM_CFLAGS@ \
- @LIBGTKMM_CFLAGS@ \
- @GEGL_CFLAGS@ @EXEMPI_CFLAGS@ @OPENRAW_CFLAGS@
+ @FRAMEWORK_CFLAGS@ \
+ @GEGL_CFLAGS@ @OPENRAW_CFLAGS@
noinst_LIBRARIES=libmoduledarkroom.a
diff --git a/src/niepce/modules/interfaces/Makefile.am b/src/niepce/modules/interfaces/Makefile.am
index 5d04fa7..636db34 100644
--- a/src/niepce/modules/interfaces/Makefile.am
+++ b/src/niepce/modules/interfaces/Makefile.am
@@ -1,10 +1,7 @@
AM_CPPFLAGS = -I$(top_srcdir)/src/ \
- @EXEMPI_CFLAGS@ \
- @LIBGLIBMM_CFLAGS@ \
- @LIBGTKMM_CFLAGS@
-
+ @FRAMEWORK_CFLAGS@
noinst_HEADERS = ipostimportprocessing.hpp \
$(NULL)
diff --git a/src/niepce/ui/Makefile.am b/src/niepce/ui/Makefile.am
index 56c1f67..702eddc 100644
--- a/src/niepce/ui/Makefile.am
+++ b/src/niepce/ui/Makefile.am
@@ -14,9 +14,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/ -I$(srcdir)/.. -I$(srcdir)/thumb-view \
-I$(top_srcdir)/src/ext \
-DGLADEDIR=\"$(gladedir)\" \
-DDATADIR=\"$(datadir)\" \
- @LIBGLIBMM_CFLAGS@ \
- @LIBGTKMM_CFLAGS@ \
- @EXEMPI_CFLAGS@
+ @FRAMEWORK_CFLAGS@
EXTRA_DIST = $(gladefiles)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]