[gtkmm-documentation] Link with required libraries only



commit 4946a852363ccaf2f7500131563366d5d821f1c3
Author: Daniel Elstner <daniel kitta gmail com>
Date:   Fri Aug 21 06:48:04 2009 +0200

    Link with required libraries only
    
    * configure.ac: Call PKG_CHECK_MODULES() separately for giomm,
    gtkmm and libglademm.
    * examples/Makefile.am (AM_CPPFLAGS): Use $(LIBGLADEMM_CFLAGS).
    (LDADD): Link with $(GTKMM_LIBS) by default.
    (book_giomm_*_LDADD): Link with $(GIOMM_LIBS).
    (book_libglademm_*_LDADD): Link with $(LIBGLADEMM_LIBS).

 ChangeLog            |   11 +++++++++++
 configure.ac         |    4 +++-
 examples/Makefile.am |   14 ++++++++++++--
 3 files changed, 26 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0353ba8..77d284a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2009-08-21  Daniel Elstner  <daniel kitta gmail com>
 
+	Link with required libraries only
+
+	* configure.ac: Call PKG_CHECK_MODULES() separately for giomm,
+	gtkmm and libglademm.
+	* examples/Makefile.am (AM_CPPFLAGS): Use $(LIBGLADEMM_CFLAGS).
+	(LDADD): Link with $(GTKMM_LIBS) by default.
+	(book_giomm_*_LDADD): Link with $(GIOMM_LIBS).
+	(book_libglademm_*_LDADD): Link with $(LIBGLADEMM_LIBS).
+
+2009-08-21  Daniel Elstner  <daniel kitta gmail com>
+
 	Remove gnome-doc-common from autogen.sh
 
 	* autogen.sh: Remove invocation of gnome-doc-common as it is not
diff --git a/configure.ac b/configure.ac
index 6a264a2..47af08b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,9 @@ AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
 AC_PROG_CXX
 AC_PATH_PROG([PERL], [perl], [perl])
 
-PKG_CHECK_MODULES([EXAMPLES], [giomm-2.4 >= 2.16.0 gtkmm-2.4 >= 2.16.0 libglademm-2.4 >= 2.6.0])
+PKG_CHECK_MODULES([GIOMM], [giomm-2.4 >= 2.16.0])
+PKG_CHECK_MODULES([GTKMM], [gtkmm-2.4 >= 2.16.0])
+PKG_CHECK_MODULES([LIBGLADEMM], [libglademm-2.4 >= 2.6.0])
 MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
 
 AC_LANG([C++])
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 2fa5ded..871e032 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -2,9 +2,9 @@
 
 AUTOMAKE_OPTIONS = subdir-objects
 
-AM_CPPFLAGS = -I$(top_builddir) $(GTHREAD_CFLAGS) $(EXAMPLES_CFLAGS)
+AM_CPPFLAGS = -I$(top_builddir) $(GTHREAD_CFLAGS) $(LIBGLADEMM_CFLAGS)
 AM_CXXFLAGS = $(EXAMPLES_WXXFLAGS)
-LDADD       = $(EXAMPLES_LIBS)
+LDADD       = $(GTKMM_LIBS)
 
 noinst_PROGRAMS =					\
 	book/alignment/example				\
@@ -318,27 +318,35 @@ book_frame_example_SOURCES =		\
 	book/frame/examplewindow.h	\
 	book/frame/main.cc
 
+book_giomm_directory_list_example_LDADD = $(GIOMM_LIBS)
 book_giomm_directory_list_example_SOURCES = \
 	book/giomm/directory_list/main.cc
 
+book_giomm_getline_getline_LDADD = $(GIOMM_LIBS)
 book_giomm_getline_getline_SOURCES = \
 	book/giomm/getline/getline.cc
 
+book_giomm_monitor_directory_monitor_directory_LDADD = $(GIOMM_LIBS)
 book_giomm_monitor_directory_monitor_directory_SOURCES = \
 	book/giomm/monitor_directory/monitor_directory.cc
 
+book_giomm_read_file_example_LDADD = $(GIOMM_LIBS)
 book_giomm_read_file_example_SOURCES = \
 	book/giomm/read_file/main.cc
 
+book_giomm_read_file_async_example_LDADD = $(GIOMM_LIBS)
 book_giomm_read_file_async_example_SOURCES = \
 	book/giomm/read_file_async/main.cc
 
+book_giomm_usage_usage_LDADD = $(GIOMM_LIBS)
 book_giomm_usage_usage_SOURCES = \
 	book/giomm/usage/usage.cc
 
+book_giomm_volumes_example_LDADD = $(GIOMM_LIBS)
 book_giomm_volumes_example_SOURCES = \
 	book/giomm/volumes/main.cc
 
+book_giomm_write_file_example_LDADD = $(GIOMM_LIBS)
 book_giomm_write_file_example_SOURCES = \
 	book/giomm/write_file/main.cc
 
@@ -370,11 +378,13 @@ book_label_example_SOURCES =		\
 	book/label/examplewindow.h	\
 	book/label/main.cc
 
+book_libglademm_derived_example_LDADD = $(LIBGLADEMM_LIBS)
 book_libglademm_derived_example_SOURCES =		\
 	book/libglademm/derived/deriveddialog.cc	\
 	book/libglademm/derived/deriveddialog.h		\
 	book/libglademm/derived/main.cc
 
+book_libglademm_simple_example_LDADD = $(LIBGLADEMM_LIBS)
 book_libglademm_simple_example_SOURCES = \
 	book/libglademm/simple/main.cc
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]