GNOME.org
 

[gtkglext] Simplify and improve use of pkg-config in configure.ac. Also, use less indirection and fewer substi

commit 62ddec342269d0682b85046731746dc3e2629fc8
Author: Braden McDaniel <braden bolt endoframe net>
Date:   Thu Dec 10 17:54:21 2009 -0500

    Simplify and improve use of pkg-config in configure.ac.  Also, use less indirection and fewer substitution variables to accommodate finer-grained usage in Makefile.am's.

 configure.ac               |  108 +++++--------------------------------------
 examples/Makefile.am       |   73 ++++++------------------------
 gdk/Makefile.am            |    7 ++-
 gdk/win32/Makefile.am      |   10 ++---
 gdk/x11/Makefile.am        |   10 ++--
 gdkglext-uninstalled.pc.in |    6 +-
 gdkglext.pc.in             |    6 +-
 gtk/Makefile.am            |    9 +++-
 gtkglext-uninstalled.pc.in |    7 ++-
 gtkglext.pc.in             |    7 ++-
 10 files changed, 62 insertions(+), 181 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 838b6d1..f74aca4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,45 +39,6 @@ m4_define([gtkglext_lt_current_minus_age],
 m4_define([gtkglext_debug_default],
           [m4_if(m4_eval(gtkglext_minor_version % 2), [1], [yes], [minimum])])dnl
 
-# Versions of dependencies
-
-# Glib
-m4_define([glib_pkg], [glib-2.0])
-m4_define([glib_required_version], [2.0.0])
-
-# GObject
-m4_define([gobject_pkg], [gobject-2.0])
-m4_define([gobject_required_version], [2.0.0])
-
-# GModule
-m4_define([gmodule_pkg], [gmodule-2.0])
-m4_define([gmodule_required_version], [2.0.0])
-
-# Pango
-m4_define([pango_pkg], [pango])
-m4_define([pango_required_version], [1.0.0])
-
-# Pangox
-m4_define([pangox_pkg], [pangox])
-m4_define([pangox_required_version], [1.0.0])
-
-# PangoFT2
-m4_define([pangoft2_pkg], [pangoft2])
-m4_define([pangoft2_required_version], [1.0.0])
-
-# GDK
-m4_define([gdk_pkg], [gdk-2.0])
-m4_define([gdk_required_version], [2.0.0])
-
-# GTK+
-m4_define([gtk_pkg], [gtk+-2.0])
-m4_define([gtk_required_version], [2.4.0])
-
-# ATK
-m4_define([atk_pkg], [atk])
-m4_define([atk_required_version], [1.28.0])
-
-
 # Process this file with autoconf to produce a configure script.
 AC_INIT([gtkglext], [gtkglext_version],
         [gtkglext-list gnome org])
@@ -136,7 +97,7 @@ AC_SUBST([LT_AGE])
 AC_SUBST([LT_CURRENT_MINUS_AGE])
 
 dnl Initialize libtool
-AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_CPP
 #AM_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
@@ -198,7 +159,6 @@ AC_SUBST([gdkglext_targetlib])
 AC_SUBST([gtkglext_targetlib])
 
 # Checks for programs.
-AM_PROG_CC_STDC
 AC_PROG_LN_S
 
 # Debug option
@@ -302,20 +262,18 @@ if test "x$enable_rebuilds" = "xyes" && \
 fi
 AC_SUBST([REBUILD])
 
-## Initial sanity check, done here so that users get told they 
-## have the wrong dependencies as early in the process as possible.
-## Later on we actually use the cflags/libs from separate pkg-config
-## calls. Oh, also the later pkg-config calls don't include 
-## the version requirements since those make the module lists 
-## annoying to construct
-PKG_CHECK_MODULES([BASE_DEPENDENCIES], [\
-gtk_pkg >= gtk_required_version \
-gdk_pkg >= gdk_required_version \
-pango_pkg >= pango_required_version \
-pangox_pkg >= pangox_required_version \
-atk_pkg >= atk_required_version \
-gmodule_pkg >= gmodule_required_version \
-])
+PKG_CHECK_MODULES([GDK], [gdk-2.0 >= 2.4], ,
+                  [AS_IF([test -z "${GDK_LIBS+x}"],
+                         [AC_MSG_FAILURE([GDK 2.4 or newer is required.])])])
+PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.4], ,
+                  [AS_IF([test -z "${GTK_LIBS+x}"],
+                         [AC_MSG_FAILURE([GTK+ 2.4 or newer is required.])])])
+PKG_CHECK_MODULES([PANGOX], [pangox], ,
+                  [AS_IF([test -z "${PANGOX_LIBS+x}"],
+                         [AC_MSG_FAILURE([Pango X font support is required.])])])
+PKG_CHECK_MODULES([PANGOFT2], [pangoft2], ,
+                  [AS_IF([test -z "${PANGOFT2_LIBS+x}"],
+                         [AC_MSG_WARN([Pango Freetype support is required to build some of the examples.])])])
 
 # Checks for libraries.
 
@@ -398,8 +356,6 @@ WINDOWING_LIBS=""
 GDKGLEXT_WIN_CFLAGS=""
 GDKGLEXT_WIN_LIBS=""
 
-GDKGLEXT_WIN_EXTRA_DEFS=""
-
 if test "x$gdktarget" = "xx11"; then
   AC_PATH_XTRA
 
@@ -451,8 +407,6 @@ AC_SUBST([WINDOWING_LIBS])
 AC_SUBST([GDKGLEXT_WIN_CFLAGS])
 AC_SUBST([GDKGLEXT_WIN_LIBS])
 
-AC_SUBST([GDKGLEXT_WIN_EXTRA_DEFS])
-
 
 ##################################################
 # Checks for OpenGL
@@ -747,41 +701,6 @@ LIBS="$save_LIBS"
 
 
 ##################################################
-# CFLAGS and LIBS
-##################################################
-
-GDKGLEXT_PACKAGES="gdk_pkg pango_pkg pangox_pkg atk_pkg gmodule_pkg"
-GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
-GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
-GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`"
-GDKGLEXT_DEP_LIBS="$GDKGLEXT_EXTRA_LIBS `$PKG_CONFIG --libs $GDKGLEXT_PACKAGES` $MATH_LIB"
-AC_SUBST([GDKGLEXT_PACKAGES])
-AC_SUBST([GDKGLEXT_EXTRA_CFLAGS])
-AC_SUBST([GDKGLEXT_EXTRA_LIBS])
-AC_SUBST([GDKGLEXT_DEP_CFLAGS])
-AC_SUBST([GDKGLEXT_DEP_LIBS])
-
-GTKGLEXT_PACKAGES="gtk_pkg"
-GTKGLEXT_EXTRA_CFLAGS=""
-GTKGLEXT_EXTRA_LIBS=""
-GTKGLEXT_DEP_CFLAGS="$GTKGLEXT_EXTRA_CFLAGS $GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES $GTKGLEXT_PACKAGES`"
-GTKGLEXT_DEP_LIBS="$GTKGLEXT_EXTRA_LIBS $GDKGLEXT_EXTRA_LIBS `$PKG_CONFIG --libs $GDKGLEXT_PACKAGES $GTKGLEXT_PACKAGES` $MATH_LIB"
-AC_SUBST([GTKGLEXT_PACKAGES])
-AC_SUBST([GTKGLEXT_EXTRA_CFLAGS])
-AC_SUBST([GTKGLEXT_EXTRA_LIBS])
-AC_SUBST([GTKGLEXT_DEP_CFLAGS])
-AC_SUBST([GTKGLEXT_DEP_LIBS])
-
-# CFLAGS for examples
-EXAMPLES_DEP_CFLAGS="$GTKGLEXT_EXTRA_CFLAGS $GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES $GTKGLEXT_PACKAGES pangoft2_pkg`"
-AC_SUBST([EXAMPLES_DEP_CFLAGS])
-
-# GtkGLExt dep libs + PangoFT2
-GTKGLEXT_DEP_LIBS_WITH_PANGOFT2="$GTKGLEXT_EXTRA_LIBS $GDKGLEXT_EXTRA_LIBS `$PKG_CONFIG --libs $GDKGLEXT_PACKAGES $GTKGLEXT_PACKAGES pangoft2_pkg` $MATH_LIB"
-AC_SUBST([GTKGLEXT_DEP_LIBS_WITH_PANGOFT2])
-
-
-##################################################
 # Checks for gtk-doc and docbook-tools
 ##################################################
 
@@ -938,5 +857,4 @@ configuration:
 	OpenGL LIBS:		$GL_LIBS
 	multihead support:	$GDKGLEXT_MULTIHEAD_SUPPORT
 	debug:			$enable_debug
-	extra defs:		$GDKGLEXT_WIN_EXTRA_DEFS
 "
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 02194da..28debb4 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -17,25 +17,23 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gdk		\
 	-I$(top_builddir)/gtk		\
 	$(GTKGLEXT_DEBUG_FLAGS)		\
+	$(GTK_CFLAGS)			\
+	$(GL_CFLAGS)			\
+	$(GDKGLEXT_WIN_CFLAGS)		\
 	$(EXAMPLES_DEP_CFLAGS)		\
 	-DG_DISABLE_DEPRECATED		\
 	-DGDK_DISABLE_DEPRECATED	\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
 	-DGTK_DISABLE_DEPRECATED
 
-DEPS = \
-	$(top_builddir)/gdk/$(gdkglext_targetlib)	\
-	$(top_builddir)/gtk/$(gtkglext_targetlib)
+LDADD = \
+	../gdk/$(gdkglext_targetlib)	\
+	../gtk/$(gtkglext_targetlib)
 
-LDADDS = \
-	$(top_builddir)/gdk/$(gdkglext_targetlib)	\
-	$(top_builddir)/gtk/$(gtkglext_targetlib)	\
-	$(GTKGLEXT_DEP_LIBS)
-
-LDADDS_WITH_PANGOFT2 = \
-	$(top_builddir)/gdk/$(gdkglext_targetlib)	\
-	$(top_builddir)/gtk/$(gtkglext_targetlib)	\
-	$(GTKGLEXT_DEP_LIBS_WITH_PANGOFT2)
+AM_LDFLAGS = \
+	$(GTK_LIBS)		\
+	$(GL_LIBS)		\
+	$(GDKGLEXT_WIN_LIBS)
 
 common_programs = \
 	low-level		\
@@ -74,100 +72,58 @@ EXTRA_PROGRAMS = $(common_programs) $(x11_programs)
 endif
 
 low_level_SOURCES = low-level.c
-low_level_DEPENDENCIES = $(DEPS)
-low_level_LDADD = $(LDADDS)
 
 simple_SOURCES = simple.c
-simple_DEPENDENCIES = $(DEPS)
-simple_LDADD = $(LDADDS)
 
 simple_mixed_SOURCES = simple-mixed.c
-simple_mixed_DEPENDENCIES = $(DEPS)
-simple_mixed_LDADD = $(LDADDS)
 
 pixmap_SOURCES = pixmap.c
-pixmap_DEPENDENCIES = $(DEPS)
-pixmap_LDADD = $(LDADDS)
 
 pixmap_mixed_SOURCES = pixmap-mixed.c
-pixmap_mixed_DEPENDENCIES = $(DEPS)
-pixmap_mixed_LDADD = $(LDADDS)
 
 share_lists_SOURCES = share-lists.c
-share_lists_DEPENDENCIES = $(DEPS)
-share_lists_LDADD = $(LDADDS)
 
 color_SOURCES = color.c
-color_DEPENDENCIES = $(DEPS)
-color_LDADD = $(LDADDS)
 
 font_SOURCES = font.c
-font_DEPENDENCIES = $(DEPS)
-font_LDADD = $(LDADDS)
 
 button_SOURCES = button.c
-button_DEPENDENCIES = $(DEPS)
-button_LDADD = $(LDADDS)
 
 shapes_SOURCES = trackball.h trackball.c shapes.c
-shapes_DEPENDENCIES = $(DEPS)
-shapes_LDADD = $(LDADDS)
 
 logo_SOURCES = trackball.h trackball.c logo-model.h logo-model.c logo.c
 EXTRA_logo_SOURCES = logo-g.c logo-t.c logo-k.c
-logo_DEPENDENCIES = $(DEPS)
-logo_LDADD = $(LDADDS)
 
 gears_SOURCES = gears.c
-gears_DEPENDENCIES = $(DEPS)
-gears_LDADD = $(LDADDS)
 
 multiarb_SOURCES = readtex.h readtex.c multiarb.c
-multiarb_DEPENDENCIES = $(DEPS)
-multiarb_LDADD = $(LDADDS)
 
 viewlw_SOURCES = viewlw.c lw.h lw.c trackball.h trackball.c
-viewlw_DEPENDENCIES = $(DEPS)
-viewlw_LDADD = $(LDADDS)
 
 rotating_square_SOURCES = rotating-square.c
-rotating_square_DEPENDENCIES = $(DEPS)
-rotating_square_LDADD = $(LDADDS)
 
 coolwave_SOURCES = coolwave.c
-coolwave_DEPENDENCIES = $(DEPS)
-coolwave_LDADD = $(LDADDS)
 
 coolwave2_SOURCES = coolwave2.c
-coolwave2_DEPENDENCIES = $(DEPS)
-coolwave2_LDADD = $(LDADDS)
 
 template_SOURCES = template.c
-template_DEPENDENCIES = $(DEPS)
-template_LDADD = $(LDADDS)
 
 scribble_gl_SOURCES = scribble-gl.c
-scribble_gl_DEPENDENCIES = $(DEPS)
-scribble_gl_LDADD = $(LDADDS)
 
 font_pangoft2_SOURCES = font-pangoft2.c
-font_pangoft2_DEPENDENCIES = $(DEPS)
-font_pangoft2_LDADD = $(LDADDS_WITH_PANGOFT2)
+font_pangoft2_CPPFLAGS = $(AM_CPPFLAGS) $(PANGOFT2_CFLAGS)
+font_pangoft2_LDFLAGS = $(AM_LDFLAGS) $(GTKGLEXT_DEP_LIBS_WITH_PANGOFT2)
 
 font_pangoft2_tex_SOURCES = font-pangoft2-tex.c
-font_pangoft2_tex_DEPENDENCIES = $(DEPS)
-font_pangoft2_tex_LDADD = $(LDADDS_WITH_PANGOFT2)
+font_pangoft2_tex_CPPFLAGS = $(AM_CPPFLAGS) $(PANGOFT2_CFLAGS)
+font_pangoft2_tex_LDFLAGS = $(AM_LDFLAGS) $(GTKGLEXT_DEP_LIBS_WITH_PANGOFT2)
 
 simple_pbuffer_sgix_SOURCES = simple-pbuffer-sgix.c
-simple_pbuffer_sgix_DEPENDENCIES = $(DEPS)
-simple_pbuffer_sgix_LDADD = $(LDADDS)
 
 glxinfo_SOURCES = glxinfo.c
-glxinfo_DEPENDENCIES = $(DEPS)
 glxinfo_LDADD = $(GL_LIBS) $(WINDOWING_LIBS) $(MATH_LIB)
 
 wglinfo_SOURCES = wglinfo.c
-wglinfo_DEPENDENCIES = $(DEPS)
 wglinfo_LDADD = $(GL_LIBS) $(WINDOWING_LIBS)
 
 
@@ -175,4 +131,3 @@ all-local: $(EXTRA_PROGRAMS)
 
 clean-local:
 	-rm -f $(EXTRA_PROGRAMS)
-
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 53096fb..8721588 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -43,7 +43,10 @@ common_includes = \
 	-DGDK_GL_COMPILATION		\
 	-I$(top_srcdir)			\
 	$(GTKGLEXT_DEBUG_FLAGS)		\
-	$(GDKGLEXT_DEP_CFLAGS)		\
+	$(GDK_CFLAGS)			\
+	$(GTK_CFLAGS)			\
+	$(GL_CFLAGS)			\
+	$(GDKGLEXT_WIN_CFLAGS)		\
 	-DG_DISABLE_DEPRECATED		\
 	-DGDK_DISABLE_DEPRECATED	\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED
@@ -57,7 +60,7 @@ common_ldflags = \
 	$(gdkglext_win32_symbols)
 
 common_libadd = \
-	$(GDKGLEXT_DEP_LIBS)
+	$(GDK_LIBS) $(GL_LIBS) $(GDKGLEXT_WIN_LIBS)
 
 #
 # setup source file variables
diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index c3ae8cb..5e2532e 100644
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -9,15 +9,13 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/gdk		\
 	-I$(top_builddir)/gdk		\
 	$(GTKGLEXT_DEBUG_FLAGS)		\
-	$(GDKGLEXT_DEP_CFLAGS)		\
-	$(GDKGLEXT_WIN_EXTRA_DEFS)	\
+	$(GDK_CFLAGS)			\
+	$(GL_CFLAGS)			\
+	$(GDKGLEXT_WIN_CFLAGS)		\
 	-DG_DISABLE_DEPRECATED		\
 	-DGDK_DISABLE_DEPRECATED	\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED
 
-LDADDS = \
-	$(GDKGLEXT_DEP_LIBS)
-
 gdkglext_win32_public_h_sources = \
 	gdkglwin32.h		\
 	gdkglwglext.h
@@ -52,4 +50,4 @@ gdkglextwin32include_HEADERS = $(gdkglext_win32_headers)
 noinst_LTLIBRARIES = libgdkglext-win32.la
 
 libgdkglext_win32_la_SOURCES = $(gdkglext_win32_sources)
-
+libgdkglext_win32_la_LDFLAGS = $(GDK_LIBS) $(GL_LIBS) $(GDKGLEXT_WIN_LIBS)
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index 3de7c22..d311713 100644
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -9,15 +9,14 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/gdk		\
 	-I$(top_builddir)/gdk		\
 	$(GTKGLEXT_DEBUG_FLAGS)		\
-	$(GDKGLEXT_DEP_CFLAGS)		\
-        $(GDKGLEXT_WIN_EXTRA_DEFS)	\
+	$(GDK_CFLAGS)			\
+	$(GL_CFLAGS)			\
+	$(GDKGLEXT_WIN_CFLAGS)		\
+	$(PANGOX_CFLAGS)		\
 	-DG_DISABLE_DEPRECATED		\
 	-DGDK_DISABLE_DEPRECATED	\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED
 
-LDADDS = \
-	$(GDKGLEXT_DEP_LIBS)
-
 gdkglext_x11_public_h_sources = \
 	gdkglx.h		\
 	gdkglglxext.h
@@ -54,4 +53,5 @@ gdkglextx11include_HEADERS = $(gdkglext_x11_headers)
 noinst_LTLIBRARIES = libgdkglext-x11.la
 
 libgdkglext_x11_la_SOURCES = $(gdkglext_x11_sources)
+libgdkglext_x11_la_LDFLAGS = $(GDK_LIBS) $(GL_LIBS) $(GDKGLEXT_WIN_LIBS) $(PANGOX_LIBS)
 
diff --git a/gdkglext-uninstalled.pc.in b/gdkglext-uninstalled.pc.in
index ca7b1db..4558dee 100644
--- a/gdkglext-uninstalled.pc.in
+++ b/gdkglext-uninstalled.pc.in
@@ -6,6 +6,6 @@ multihead= GDKGLEXT_MULTIHEAD_SUPPORT@
 Name: GdkGLExt Uninstalled
 Description: OpenGL Extension to GDK (${target} target), Not Installed
 Version: @VERSION@
-Requires: @GDKGLEXT_PACKAGES@
-Libs: ${pc_top_builddir}${pcfiledir}/gdk/libgdkglext-${target}-${api_version}.la @GDKGLEXT_EXTRA_LIBS@
-Cflags: -I${pc_top_builddir}${pcfiledir} -I${pc_top_builddir}${pcfiledir}/@srcdir@ -I${pc_top_builddir}${pcfiledir}/gdk @GDKGLEXT_EXTRA_CFLAGS@
+Requires: gdk-2.0 pangox
+Libs: ${pc_top_builddir}${pcfiledir}/gdk/libgdkglext-${target}-${api_version}.la @GL_LIBS@ @GDKGLEXT_WIN_LIBS@
+Cflags: -I${pc_top_builddir}${pcfiledir} -I${pc_top_builddir}${pcfiledir}/@srcdir@ -I${pc_top_builddir}${pcfiledir}/gdk @GL_CFLAGS@ @GDKGLEXT_WIN_CFLAGS@
diff --git a/gdkglext.pc.in b/gdkglext.pc.in
index 12d6c9b..cb789f2 100644
--- a/gdkglext.pc.in
+++ b/gdkglext.pc.in
@@ -11,6 +11,6 @@ multihead= GDKGLEXT_MULTIHEAD_SUPPORT@
 Name: GdkGLExt
 Description: OpenGL Extension to GDK (${target} target)
 Version: @VERSION@
-Requires: @GDKGLEXT_PACKAGES@
-Libs: -L${libdir} -lgdkglext-${target}-${api_version} @GDKGLEXT_EXTRA_LIBS@
-Cflags: -I${includedir}/gtkglext-${api_version} -I${libdir}/gtkglext-${api_version}/include @GDKGLEXT_EXTRA_CFLAGS@
+Requires: gdk-2.0 pangox
+Libs: -L${libdir} -lgdkglext-${target}-${api_version} @GL_LIBS@ @GDKGLEXT_WIN_LIBS@
+Cflags: -I${includedir}/gtkglext-${api_version} -I${libdir}/gtkglext-${api_version}/include @GL_CFLAGS@ @GDKGLEXT_WIN_CFLAGS@
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 0c56d6e..7b2ecce 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -36,7 +36,9 @@ common_includes = \
 	-I$(top_srcdir)			\
 	-I$(top_builddir)/gdk		\
 	$(GTKGLEXT_DEBUG_FLAGS)		\
-	$(GTKGLEXT_DEP_CFLAGS)		\
+	$(GTK_CFLAGS)			\
+	$(GL_CFLAGS)			\
+	$(GDKGLEXT_WIN_CFLAGS)		\
 	-DG_DISABLE_DEPRECATED		\
 	-DGDK_DISABLE_DEPRECATED	\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
@@ -52,7 +54,10 @@ common_ldflags = \
 
 common_libadd = \
 	$(top_builddir)/gdk/$(gdkglext_targetlib)		\
-	$(GTKGLEXT_DEP_LIBS)
+	$(GTK_LIBS)						\
+	$(GL_LIBS)						\
+	$(GDKGLEXT_WIN_LIBS)					\
+	$(MATH_LIB)
 
 #
 # setup source file variables
diff --git a/gtkglext-uninstalled.pc.in b/gtkglext-uninstalled.pc.in
index 465726c..fda3388 100644
--- a/gtkglext-uninstalled.pc.in
+++ b/gtkglext-uninstalled.pc.in
@@ -6,6 +6,7 @@ multihead= GDKGLEXT_MULTIHEAD_SUPPORT@
 Name: GtkGLExt Uninstalled
 Description: OpenGL Extension to GTK+ (${target} target), Not Installed
 Version: @VERSION@
-Requires: gdkglext-${target}-${api_version}-uninstalled @GTKGLEXT_PACKAGES@
-Libs: ${pc_top_builddir}${pcfiledir}/gtk/libgtkglext-${target}-${api_version}.la @GTKGLEXT_EXTRA_LIBS@
-Cflags: -I${pc_top_builddir}${pcfiledir} -I${pc_top_builddir}${pcfiledir}/@srcdir@ @GTKGLEXT_EXTRA_CFLAGS@
+Requires: gtk-2.0 gdkglext-${target}-${api_version}-uninstalled
+Libs: ${pc_top_builddir}${pcfiledir}/gtk/libgtkglext-${target}-${api_version}.la
+Libs.private: @MATH_LIB@
+Cflags: -I${pc_top_builddir}${pcfiledir} -I${pc_top_builddir}${pcfiledir}/@srcdir@
diff --git a/gtkglext.pc.in b/gtkglext.pc.in
index b491dd5..5f1aa23 100644
--- a/gtkglext.pc.in
+++ b/gtkglext.pc.in
@@ -11,6 +11,7 @@ multihead= GDKGLEXT_MULTIHEAD_SUPPORT@
 Name: GtkGLExt
 Description: OpenGL Extension to GTK+ (${target} target)
 Version: @VERSION@
-Requires: gdkglext-${target}-${api_version} @GTKGLEXT_PACKAGES@
-Libs: -L${libdir} -lgtkglext-${target}-${api_version} @GTKGLEXT_EXTRA_LIBS@
-Cflags: -I${includedir}/gtkglext-${api_version} @GTKGLEXT_EXTRA_CFLAGS@
+Requires: gtk-2.0 gdkglext-${target}-${api_version}
+Libs: -L${libdir} -lgtkglext-${target}-${api_version}
+Libs.private: @MATH_LIB@
+Cflags: -I${includedir}/gtkglext-${api_version}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]