GNOME.org
 

[gtkmm] Provide pkg-config files for uninstalled use

commit a7cb15ccb0ec73a18de7611b2c2f3e850499a5aa
Author: Daniel Elstner <daniel kitta gmail com>
Date:   Sun Aug 16 21:26:43 2009 +0200

    Provide pkg-config files for uninstalled use
    
    * atk/atkmm-1.6-uninstalled.pc.in: New pkg-config metadata file
    for building against a non-installed library.
    * gdk/gdkmm-2.4-uninstalled.pc.in: ditto,
    * gtk/gtkmm-2.4-uninstalled.pc.in: ditto.
    * configure.ac (GTKMM_REQ_ATKMM): Rename from GTKMM_PC_ATKMM_DEP.
    (GTKMM_REQ_ATKMM_UNINST): Add variant for the uninstalled library.
    (AC_CONFIG_FILES): List new *-uninstalled.pc output files.
    * gtk/gtkmm-2.4.pc.in (Requires): Substitute @GTKMM_REQ_ATKMM  

 .gitignore                      |    6 +++---
 ChangeLog                       |   13 +++++++++++++
 atk/atkmm-1.6-uninstalled.pc.in |   10 ++++++++++
 configure.ac                    |   10 +++++++---
 gdk/gdkmm-2.4-uninstalled.pc.in |   10 ++++++++++
 gtk/gtkmm-2.4-uninstalled.pc.in |   10 ++++++++++
 gtk/gtkmm-2.4.pc.in             |    2 +-
 7 files changed, 54 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ac02c62..d5bf66d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,7 +35,7 @@ MSVC_Net2008/gtkmm/gtkmm.rc
 MSVC_Net2008/gtkmm/gtkmmconfig.h
 
 # atk
-atk/atkmm-1.6.pc
+atk/atkmm-*.pc
 atk/atkmm/action.cc
 atk/atkmm/action.h
 atk/atkmm/component.cc
@@ -88,7 +88,7 @@ demos/pixbuf-demo
 /docs/reference/html/
 
 # gdk
-gdk/gdkmm-2.4.pc
+gdk/gdkmm-*.pc
 gdk/gdkmm/bitmap.cc
 gdk/gdkmm/bitmap.h
 gdk/gdkmm/color.cc
@@ -144,7 +144,7 @@ gdk/gdkmmconfig.h
 gdk/stamp-h2
 
 # gtk
-gtk/gtkmm-2.4.pc
+gtk/gtkmm-*.pc
 gtk/gtkmm/aboutdialog.cc
 gtk/gtkmm/aboutdialog.h
 gtk/gtkmm/accelgroup.cc
diff --git a/ChangeLog b/ChangeLog
index 9cf6459..2cc31bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2009-08-16  Daniel Elstner  <daniel kitta gmail com>
 
+	Provide pkg-config files for uninstalled use
+
+	* atk/atkmm-1.6-uninstalled.pc.in: New pkg-config metadata file
+	for building against a non-installed library.
+	* gdk/gdkmm-2.4-uninstalled.pc.in: ditto,
+	* gtk/gtkmm-2.4-uninstalled.pc.in: ditto.
+	* configure.ac (GTKMM_REQ_ATKMM): Rename from GTKMM_PC_ATKMM_DEP.
+	(GTKMM_REQ_ATKMM_UNINST): Add variant for the uninstalled library.
+	(AC_CONFIG_FILES): List new *-uninstalled.pc output files.
+	* gtk/gtkmm-2.4.pc.in (Requires): Substitute @GTKMM_REQ_ATKMM  
+
+2009-08-16  Daniel Elstner  <daniel kitta gmail com>
+
 	Simplify and update for recent mm-common
 
 	* configure.ac: Insert MM_PREREQ([0.4]) macro call.
diff --git a/atk/atkmm-1.6-uninstalled.pc.in b/atk/atkmm-1.6-uninstalled.pc.in
new file mode 100644
index 0000000..c60fdae
--- /dev/null
+++ b/atk/atkmm-1.6-uninstalled.pc.in
@@ -0,0 +1,10 @@
+doxytagfile=${docdir}/reference/@GTKMM_MODULE_NAME  tag
+htmlrefpub=http://www.gtkmm.org/docs/@GTKMM_MODULE_NAME@/docs/reference/html/
+
+Name: atkmm
+Description: C++ binding for the ATK accessibility toolkit, uninstalled
+Version: @PACKAGE_VERSION@
+URL: http://www.gtkmm.org/
+Requires: @ATKMM_MODULES@
+Libs: ${pc_top_builddir}/${pcfiledir}/atkmm/libatkmm- ATKMM_API_VERSION@.la
+Cflags: -I${pc_top_builddir}/${pcfiledir} -I${pc_top_builddir}/${pcfiledir}/@srcdir@
diff --git a/configure.ac b/configure.ac
index 8e554da..6281c50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,9 +100,10 @@ AM_CONDITIONAL([DISABLE_DEPRECATED_API], [test "x$gtkmm_deprecated_api" = xno])
 GTKMM_ARG_ENABLE_API_ATKMM
 
 AS_IF([test "x$gtkmm_enable_api_atkmm" = xno],
-      [GTKMM_PC_ATKMM_DEP=],
-      [GTKMM_PC_ATKMM_DEP=$ATKMM_MODULE_NAME])
-AC_SUBST([GTKMM_PC_ATKMM_DEP])
+      [GTKMM_REQ_ATKMM= GTKMM_REQ_ATKMM_UNINST=],
+      [GTKMM_REQ_ATKMM=$ATKMM_MODULE_NAME GTKMM_REQ_ATKMM_UNINST=$ATKMM_MODULE_NAME-uninstalled])
+AC_SUBST([GTKMM_REQ_ATKMM])
+AC_SUBST([GTKMM_REQ_ATKMM_UNINST])
 AM_CONDITIONAL([GTKMM_ATKMM_ENABLED], [test "x$gtkmm_enable_api_atkmm" != xno])
 
 GTKMM_ARG_ENABLE_API_MAEMO_EXTENSIONS
@@ -119,12 +120,15 @@ MM_ARG_ENABLE_WARNINGS([GTKMM_WXXFLAGS],
 AC_CONFIG_FILES([Makefile
                  tools/Makefile
                  atk/atkmm-1.6.pc
+                 atk/atkmm-1.6-uninstalled.pc
                  atk/src/Makefile
                  atk/atkmm/Makefile
                  gdk/gdkmm-2.4.pc
+                 gdk/gdkmm-2.4-uninstalled.pc
                  gdk/src/Makefile
                  gdk/gdkmm/Makefile
                  gtk/gtkmm-2.4.pc
+                 gtk/gtkmm-2.4-uninstalled.pc
                  gtk/src/Makefile
                  gtk/gtkmm/Makefile
                  tests/Makefile
diff --git a/gdk/gdkmm-2.4-uninstalled.pc.in b/gdk/gdkmm-2.4-uninstalled.pc.in
new file mode 100644
index 0000000..f018a81
--- /dev/null
+++ b/gdk/gdkmm-2.4-uninstalled.pc.in
@@ -0,0 +1,10 @@
+doxytagfile=${docdir}/reference/@GTKMM_MODULE_NAME  tag
+htmlrefpub=http://www.gtkmm.org/docs/@GTKMM_MODULE_NAME@/docs/reference/html/
+
+Name: gdkmm
+Description: C++ binding for the GDK drawing kit, not installed
+Version: @PACKAGE_VERSION@
+URL: http://www.gtkmm.org/
+Requires: @GDKMM_MODULES@
+Libs: ${pc_top_builddir}/${pcfiledir}/gdkmm/libgdkmm- GDKMM_API_VERSION@.la
+Cflags: -I${pc_top_builddir}/${pcfiledir} -I${pc_top_builddir}/${pcfiledir}/@srcdir@
diff --git a/gtk/gtkmm-2.4-uninstalled.pc.in b/gtk/gtkmm-2.4-uninstalled.pc.in
new file mode 100644
index 0000000..1c336c4
--- /dev/null
+++ b/gtk/gtkmm-2.4-uninstalled.pc.in
@@ -0,0 +1,10 @@
+doxytagfile=${docdir}/reference/@GTKMM_MODULE_NAME  tag
+htmlrefpub=http://www.gtkmm.org/docs/@GTKMM_MODULE_NAME@/docs/reference/html/
+
+Name: gtkmm
+Description: C++ binding for the GTK+ toolkit, not installed
+Version: @PACKAGE_VERSION@
+URL: http://www.gtkmm.org/
+Requires: @GDKMM_MODULES@ @GTKMM_REQ_ATKMM_UNINST@ @GDKMM_MODULE_NAME -uninstalled
+Libs: ${pc_top_builddir}/${pcfiledir}/gtkmm/libgtkmm- GTKMM_API_VERSION@.la
+Cflags: -I${pc_top_builddir}/${pcfiledir} -I${pc_top_builddir}/${pcfiledir}/@srcdir@
diff --git a/gtk/gtkmm-2.4.pc.in b/gtk/gtkmm-2.4.pc.in
index 8f2130d..ff6bd2f 100644
--- a/gtk/gtkmm-2.4.pc.in
+++ b/gtk/gtkmm-2.4.pc.in
@@ -14,6 +14,6 @@ Name: gtkmm
 Description: C++ binding for the GTK+ toolkit
 Version: @PACKAGE_VERSION@
 URL: http://www.gtkmm.org/
-Requires: @GTKMM_MODULES@ @GTKMM_PC_ATKMM_DEP@
+Requires: @GTKMM_MODULES@ @GTKMM_REQ_ATKMM@
 Libs: -L${libdir} -lgtkmm- GTKMM_API_VERSION@
 Cflags: -I${includedir}/@GTKMM_MODULE_NAME@ -I${libdir}/@GTKMM_MODULE_NAME@/include
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]