[gtk+/gdk-backend: 10/91] Reorganize pc files for a single library

[Benjamin Otte <otte src gnome org>]

commit 941af8f07aa0a4610f8d5047c0f5e294a42bf23b
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Dec 8 23:22:49 2010 -0500

    Reorganize pc files for a single library
    
    After this commit, pc files no longer include the gdk backend in
    their name, and we no longer install a pc file for gdk. There is
    now a single gtk+-3.0.pc file. It turns out a separate gtk+-x11-3.0.pc
    file is not necessary, since gdkx.h doesn't have a separate include
    directory that would have to be added to Cflags.

 Makefile.am               |   48 ++++++--------------------------------------
 configure.ac              |    2 -
 gdk-3.0-uninstalled.pc.in |    8 -------
 gdk-3.0.pc.in             |   12 -----------
 gtk+-3.0.pc.in            |    6 ++--
 gtk+-unix-print-3.0.pc.in |    2 +-
 6 files changed, 11 insertions(+), 67 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 1444496..68002d7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,40 +54,19 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/ChangeLog \
 	`find "$(srcdir)" -type f -name Makefile.in -print`
 
-GDKTARGET= gdktarget@
-
-## Copy .pc files to target-specific names
-gtk+-$(GDKTARGET)-3.0.pc: gtk+-3.0.pc
-	rm -f gtk+-$(GDKTARGET)-3.0.pc && \
-	cp gtk+-3.0.pc gtk+-$(GDKTARGET)-3.0.pc
-
-gdk-$(GDKTARGET)-3.0.pc: gdk-3.0.pc
-	rm -f gdk-$(GDKTARGET)-3.0.pc && \
-	cp gdk-3.0.pc gdk-$(GDKTARGET)-3.0.pc
-
-gtk+-$(GDKTARGET)-3.0-uninstalled.pc: gtk+-3.0-uninstalled.pc
-	rm -f gtk+-$(GDKTARGET)-3.0-uninstalled.pc && \
-	cp gtk+-3.0-uninstalled.pc gtk+-$(GDKTARGET)-3.0-uninstalled.pc
-
-gdk-$(GDKTARGET)-3.0-uninstalled.pc: gdk-3.0-uninstalled.pc
-	rm -f gdk-$(GDKTARGET)-3.0-uninstalled.pc && \
-	cp gdk-3.0-uninstalled.pc gdk-$(GDKTARGET)-3.0-uninstalled.pc
-
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gdk-$(GDKTARGET)-3.0.pc gtk+-$(GDKTARGET)-3.0.pc gail-3.0.pc
+pkgconfig_DATA = gtk+-3.0.pc gail-3.0.pc
 
 if OS_UNIX
 pkgconfig_DATA += gtk+-unix-print-3.0.pc
 endif
 
-DISTCLEANFILES =				\
-	gtk+-unix-print-3.0.pc			\
-	gtk+-$(GDKTARGET)-3.0.pc		\
-	gdk-$(GDKTARGET)-3.0.pc			\
-	gail-3.0.pc				\
-	gtk+-$(GDKTARGET)-3.0-uninstalled.pc	\
-	gdk-$(GDKTARGET)-3.0-uninstalled.pc	\
-	gail-3.0-uninstalled.pc			\
+DISTCLEANFILES = \
+	gtk+-unix-print-3.0.pc		\
+	gtk+-3.0.pc			\
+	gail-3.0.pc			\
+	gtk+-3.0-uninstalled.pc		\
+	gail-3.0-uninstalled.pc		\
 	config.lt
 
 distclean-local:
@@ -109,20 +88,7 @@ ChangeLog:
 	  echo A git checkout and git-log is required to generate this file >> $@); \
 	fi
 
-## copy the default target for this platform to gdk-3.0.pc and gtk+-3.0.pc
-DEFAULT_GDKTARGET=x11
-install-data-hook:
-	(cd $(DESTDIR)$(pkgconfigdir) && \
-	 test -f gdk-$(DEFAULT_GDKTARGET)-3.0.pc && \
-	 test -f gtk+-$(DEFAULT_GDKTARGET)-3.0.pc && \
-	 rm -f gdk-3.0.pc && cp -f gdk-$(DEFAULT_GDKTARGET)-3.0.pc gdk-3.0.pc && \
-	 rm -f gtk+-3.0.pc && cp -f gtk+-$(DEFAULT_GDKTARGET)-3.0.pc gtk+-3.0.pc) || \
-	(cd $(DESTDIR)$(pkgconfigdir) && \
-	 rm -f gdk-3.0.pc && cp -f gdk-$(GDKTARGET)-3.0.pc gdk-3.0.pc && \
-	 rm -f gtk+-3.0.pc && cp -f gtk+-$(GDKTARGET)-3.0.pc gtk+-3.0.pc)
-
 uninstall-local:
-	rm -f $(DESTDIR)$(pkgconfigdir)/gdk-3.0.pc
 	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-3.0.pc
 
 dist-hook:
diff --git a/configure.ac b/configure.ac
index d1c99e6..fdc9fc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1560,11 +1560,9 @@ AC_CONFIG_FILES([
 config.h.win32
 gtk-zip.sh
 Makefile
-gdk-3.0.pc
 gtk+-3.0.pc
 gtk+-unix-print-3.0.pc
 gail-3.0.pc
-gdk-3.0-uninstalled.pc
 gtk+-3.0-uninstalled.pc
 gail-3.0-uninstalled.pc
 m4macros/Makefile
diff --git a/gtk+-3.0.pc.in b/gtk+-3.0.pc.in
index ccb8c7e..c686112 100644
--- a/gtk+-3.0.pc.in
+++ b/gtk+-3.0.pc.in
@@ -8,8 +8,8 @@ gtk_binary_version= GTK_BINARY_VERSION@
 gtk_host= host@
 
 Name: GTK+
-Description: GTK+ Graphical UI Library (${target} target)
+Description: GTK+ Graphical UI Library
 Version: @VERSION@
-Requires: gdk-${target}- GTK_API_VERSION@ @GTK_PACKAGES@
-Libs: -L${libdir} -lgtk-${target}- GTK_API_VERSION@ @GTK_EXTRA_LIBS@
+Requires: @GTK_PACKAGES@
+Libs: -L${libdir} -lgtk- GTK_API_VERSION@ @GTK_EXTRA_LIBS@
 Cflags: -I${includedir}/gtk- GTK_API_VERSION@ @GTK_EXTRA_CFLAGS@ -DGSEAL_ENABLE
diff --git a/gtk+-unix-print-3.0.pc.in b/gtk+-unix-print-3.0.pc.in
index 5b8462a..cbace1a 100644
--- a/gtk+-unix-print-3.0.pc.in
+++ b/gtk+-unix-print-3.0.pc.in
@@ -10,5 +10,5 @@ gtk_host= host@
 Name: GTK+
 Description: GTK+ Unix print support
 Version: @VERSION@
-Requires: gtk+-${target}- GTK_API_VERSION@ @GTK_PACKAGES@
+Requires: gtk+- GTK_API_VERSION@ @GTK_PACKAGES@
 Cflags: -I${includedir}/gtk- GTK_API_VERSION@/unix-print