GNOME.org
 

gtkmm r1010 - in trunk: . MSVC_Net2003 MSVC_Net2003/pangomm demos demos/gtk-demo gdk/gdkmm gtk/gtkmm pango tests

Author: murrayc
Date: Sat Jul 19 18:32:14 2008
New Revision: 1010
URL: http://svn.gnome.org/viewvc/gtkmm?rev=1010&view=rev

Log:
2008-07-19  Murray Cumming  <murrayc murrayc com>

* MSVC_Net2003/Makefile.am:
* Makefile.am:
* configure.in:
* demos/Makefile.am:
* demos/gtk-demo/Makefile.am:
* gdk/gdkmm/Makefile.am:
* gtk/gtkmm/Makefile.am:
* tests/Makefile.am_fragment:
* MSVC_Net2003/pangomm/
* pango/: Moved pangomm into its own source tarball, while 
keeping all the same shared library name, header 
install path, .pc file, etc.
This makes it easier, for instance, for cluttermm to depend 
on pangomm, without needing all of gtkmm at build time.

Removed:
   trunk/MSVC_Net2003/pangomm/
   trunk/pango/
Modified:
   trunk/ChangeLog
   trunk/MSVC_Net2003/Makefile.am
   trunk/Makefile.am
   trunk/configure.in
   trunk/demos/Makefile.am
   trunk/demos/gtk-demo/Makefile.am
   trunk/gdk/gdkmm/Makefile.am
   trunk/gtk/gtkmm/Makefile.am
   trunk/tests/Makefile.am_fragment

Modified: trunk/MSVC_Net2003/Makefile.am
==============================================================================
--- trunk/MSVC_Net2003/Makefile.am	(original)
+++ trunk/MSVC_Net2003/Makefile.am	Sat Jul 19 18:32:14 2008
@@ -1,3 +1,3 @@
-SUBDIRS = gendef atkmm pangomm gdkmm gtkmm demos
+SUBDIRS = gendef atkmm gdkmm gtkmm demos
 
 EXTRA_DIST = blank.cpp gtkmm.sln README

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sat Jul 19 18:32:14 2008
@@ -4,7 +4,7 @@
   ATK_SUBDIR=
 endif
 
-SUBDIRS		= tools $(ATK_SUBDIR) pango gdk gtk @DEMO_SUBDIR@ @DOCS_SUBDIR@ tests MSVC_Net2003
+SUBDIRS		= tools $(ATK_SUBDIR) gdk gtk @DEMO_SUBDIR@ @DOCS_SUBDIR@ tests MSVC_Net2003
 DIST_SUBDIRS	= $(SUBDIRS) scripts
 
 EXTRA_DIST	= build_shared/Makefile_build.am_fragment \

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Jul 19 18:32:14 2008
@@ -201,6 +201,7 @@
 gtkmm_min_giomm_version=2.16.0
 gtkmm_min_gtk_version=2.13.4
 gtkmm_min_cairomm_version=1.2.2
+gtkmm_min_pangomm_version=2.13.1
 
 
 GLIBMM_LIBDIR=`pkg-config --variable=libdir glibmm-2.4`
@@ -214,21 +215,20 @@
 AC_SUBST(ATKMM_CFLAGS)
 AC_SUBST(ATKMM_LIBS)
 
-PKG_CHECK_MODULES(PANGOMM, glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} pangocairo >= 1.5.2)
-AC_SUBST(PANGOMM_CFLAGS)
-AC_SUBST(PANGOMM_LIBS)
-
 # gdkmm really does need GTK+, because part of Gdk::DragContext is in GTK+.
-PKG_CHECK_MODULES(GDKMM, glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version})
+PKG_CHECK_MODULES(GDKMM, glibmm-2.4 >= ${gtkmm_min_glibmm_version}
+                         cairomm-1.0 >= ${gtkmm_min_cairomm_version}
+                         pangomm-1.4 >= ${gtkmm_min_pangomm_version}
+                         gtk+-2.0 >= ${gtkmm_min_gtk_version})
 AC_SUBST(GDKMM_CFLAGS)
 AC_SUBST(GDKMM_LIBS)
 
 # Only check for gtk+-unix-print-2.0 on non-win32 platform, as 
 # gtk+-unix-print-2.0.pc is not always included in win32 installers. 
 if test x"$os_win32" = xyes; then
-  PKG_CHECK_MODULES(GTKMM, glibmm-2.4 >= ${gtkmm_min_glibmm_version} giomm-2.4 >= ${gtkmm_min_giomm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version})
+  PKG_CHECK_MODULES(GTKMM, glibmm-2.4 >= ${gtkmm_min_glibmm_version} giomm-2.4 >= ${gtkmm_min_giomm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} pangomm-1.4 >= ${gtkmm_min_pangomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version})
 else
-  PKG_CHECK_MODULES(GTKMM, glibmm-2.4 >= ${gtkmm_min_glibmm_version} giomm-2.4 >= ${gtkmm_min_giomm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version} gtk+-unix-print-2.0 >= ${gtkmm_min_gtk_version})
+  PKG_CHECK_MODULES(GTKMM, glibmm-2.4 >= ${gtkmm_min_glibmm_version} giomm-2.4 >= ${gtkmm_min_giomm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} pangomm-1.4 >= ${gtkmm_min_pangomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version} gtk+-unix-print-2.0 >= ${gtkmm_min_gtk_version})
 fi
 AC_SUBST(GTKMM_CFLAGS)
 AC_SUBST(GTKMM_LIBS)
@@ -285,7 +285,7 @@
 
 
 # Create a list of input directories for Doxygen.
-GTKMM_DOXYGEN_INPUT_SUBDIRS([pango atk gdk gtk])
+GTKMM_DOXYGEN_INPUT_SUBDIRS([atk gdk gtk])
 
 # Evaluate the --enable-warnings=level option.
 GTKMM_ARG_ENABLE_WARNINGS()
@@ -313,11 +313,10 @@
 if test "x$enable_deprecated_api" = "xyes"; then
 AC_MSG_WARN([Deprecated API will be built, for backwards-compatibility.])
 else
-  AC_DEFINE(PANGOMM_DISABLE_DEPRECATED, 1, [Whether not to build deprecated API in pangomm])
   AC_DEFINE(ATKMM_DISABLE_DEPRECATED, 1, [Whether not to build deprecated API in atkmm])
   AC_DEFINE(GDKMM_DISABLE_DEPRECATED, 1, [Whether not to build deprecated API in gdkmm])
   AC_DEFINE(GTKMM_DISABLE_DEPRECATED, 1, [Whether not to build deprecated API in gtkmm])
-  DISABLE_DEPRECATED_API_CFLAGS="-DPANGOMM_DISABLE_DEPRECATED -DATKMM_DISABLE_DEPRECATED -DGDKMM_DISABLE_DEPRECATED -DGTKMM_DISABLE_DEPRECATED"
+  DISABLE_DEPRECATED_API_CFLAGS="-DATKMM_DISABLE_DEPRECATED -DGDKMM_DISABLE_DEPRECATED -DGTKMM_DISABLE_DEPRECATED"
 AC_SUBST(DISABLE_DEPRECATED_API_CFLAGS)
 AC_MSG_WARN([Deprecated API will not be built, breaking backwards-compatibility. Do not use this build for distribution packages.])
 fi
@@ -408,12 +407,6 @@
     gtk/gtkmm/Makefile
       gtk/gtkmm/private/Makefile
 
-  pango/Makefile
-  pango/pangomm-1.4.pc
-    pango/src/Makefile
-    pango/pangomm/Makefile
-      pango/pangomm/private/Makefile
-
   tools/Makefile
     tools/m4/Makefile
     tools/extra_defs_gen/Makefile
@@ -444,8 +437,6 @@
     MSVC_Net2003/gendef/Makefile
     MSVC_Net2003/atkmm/Makefile
     MSVC_Net2003/atkmm/atkmm.rc
-    MSVC_Net2003/pangomm/Makefile
-    MSVC_Net2003/pangomm/pangomm.rc
     MSVC_Net2003/gdkmm/Makefile
     MSVC_Net2003/gdkmm/gdkmm.rc
     MSVC_Net2003/gtkmm/Makefile

Modified: trunk/demos/Makefile.am
==============================================================================
--- trunk/demos/Makefile.am	(original)
+++ trunk/demos/Makefile.am	Sat Jul 19 18:32:14 2008
@@ -18,7 +18,6 @@
 #Where to find the header files needed by the source files:
 INCLUDES = -I$(top_builddir)/gtk   -I$(top_srcdir)/gtk   \
            -I$(top_builddir)/gdk   -I$(top_srcdir)/gdk   \
-           -I$(top_builddir)/pango -I$(top_srcdir)/pango \
            $(ATKMMINC) \
            $(GTKMM_CFLAGS)
 
@@ -27,8 +26,7 @@
 endif
 
 #The libraries that the executable needs to link against:
-LIBS = $(top_builddir)/pango/pangomm/libpangomm-1.4.la \
-       $(ATKMMLIB) \
+LIBS = $(ATKMMLIB) \
        $(top_builddir)/gdk/gdkmm/libgdkmm-2.4.la \
        $(top_builddir)/gtk/gtkmm/libgtkmm-2.4.la \
        $(GTKMM_LIBS)

Modified: trunk/demos/gtk-demo/Makefile.am
==============================================================================
--- trunk/demos/gtk-demo/Makefile.am	(original)
+++ trunk/demos/gtk-demo/Makefile.am	Sat Jul 19 18:32:14 2008
@@ -51,7 +51,6 @@
 INCLUDES = -DDEMOCODEDIR="\"$(democodedir)\"" \
            -I$(top_builddir)/gtk   -I$(top_srcdir)/gtk   \
            -I$(top_builddir)/gdk   -I$(top_srcdir)/gdk   \
-           -I$(top_builddir)/pango -I$(top_srcdir)/pango \
            $(ATKMMINC) \
            $(GTKMM_CFLAGS)
 
@@ -60,8 +59,7 @@
 endif
 
 #The libraries that the executable needs to link against:
-LIBS = $(top_builddir)/pango/pangomm/libpangomm-1.4.la \
-       $(ATKMMLIB) \
+LIBS = $(ATKMMLIB) \
        $(top_builddir)/gdk/gdkmm/libgdkmm-2.4.la \
        $(top_builddir)/gtk/gtkmm/libgtkmm-2.4.la \
        $(GTKMM_LIBS)

Modified: trunk/gdk/gdkmm/Makefile.am
==============================================================================
--- trunk/gdk/gdkmm/Makefile.am	(original)
+++ trunk/gdk/gdkmm/Makefile.am	Sat Jul 19 18:32:14 2008
@@ -26,6 +26,5 @@
 lib_LTLIBRARIES		= libgdkmm-2.4.la
 libgdkmm_2_4_la_SOURCES	= $(files_built_cc) $(files_extra_cc)
 libgdkmm_2_4_la_LDFLAGS	= $(common_ldflags)
-libgdkmm_2_4_la_LIBADD	= $(top_builddir)/pango/pangomm/libpangomm-1.4.la \
-			  $(GDKMM_LIBS)
+libgdkmm_2_4_la_LIBADD	= $(GDKMM_LIBS)
 

Modified: trunk/gtk/gtkmm/Makefile.am
==============================================================================
--- trunk/gtk/gtkmm/Makefile.am	(original)
+++ trunk/gtk/gtkmm/Makefile.am	Sat Jul 19 18:32:14 2008
@@ -33,7 +33,6 @@
 libgtkmm_2_4_la_SOURCES	= $(files_built_cc) $(files_extra_cc)
 libgtkmm_2_4_la_LDFLAGS	= $(common_ldflags)
 libgtkmm_2_4_la_LIBADD	= $(top_builddir)/gdk/gdkmm/libgdkmm-2.4.la \
-			  $(top_builddir)/pango/pangomm/libpangomm-1.4.la \
 			  $(LIBADD_ATK) \
 			  $(GTKMM_LIBS)
 

Modified: trunk/tests/Makefile.am_fragment
==============================================================================
--- trunk/tests/Makefile.am_fragment	(original)
+++ trunk/tests/Makefile.am_fragment	Sat Jul 19 18:32:14 2008
@@ -3,7 +3,6 @@
 endif
 
 INCLUDES = \
-	-I$(top_builddir)/pango	-I$(top_srcdir)/pango	\
 	$(ATKMMINC)	\
 	-I$(top_builddir)/gdk	-I$(top_srcdir)/gdk	\
 	-I$(top_builddir)/gtk	-I$(top_srcdir)/gtk	\
@@ -14,7 +13,6 @@
 endif
 
 LIBS = \
-	$(top_builddir)/pango/pangomm/libpangomm-1.4.la	\
 	$(ATKMMLIB)	\
 	$(top_builddir)/gdk/gdkmm/libgdkmm-2.4.la	\
 	$(top_builddir)/gtk/gtkmm/libgtkmm-2.4.la	\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]