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.

diff --git a/Makefile.am b/Makefile.am
index 14444964fdad200e46aa12bb0b851fa1398d037d..68002d77455ae3163e646f646dfafa5729caeca1 100644 (file)
--- 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 07e95691bd5b8031e85c20d71a6c9ab959d34588..9ff5b67050ebfc43b7a14c6e88be8b51cedb15ac 100644 (file)
--- 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/gdk-3.0-uninstalled.pc.in b/gdk-3.0-uninstalled.pc.in
deleted file mode 100644 (file)
index 45adcf0..0000000
--- a/gdk-3.0-uninstalled.pc.in
+++ /dev/null
@@ -1,8 +0,0 @@
-target=@gdktarget@
-
-Name: GDK Uninstalled
-Description: GTK+ Drawing Kit (${target} target), Not Installed
-Version: @VERSION@
-Requires: gdk-pixbuf-@GTK_API_VERSION@-uninstalled @GDK_PACKAGES@
-Libs: ${pc_top_builddir}/${pcfiledir}/gdk/libgdk-${target}-@GTK_API_VERSION@.la @GDK_EXTRA_LIBS@
-Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@/gdk -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir} @GDK_EXTRA_CFLAGS@

diff --git a/gdk-3.0.pc.in b/gdk-3.0.pc.in
deleted file mode 100644 (file)
index fe21977..0000000
--- a/gdk-3.0.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-target=@gdktarget@
-
-Name: GDK
-Description: GTK+ Drawing Kit (${target} target)
-Version: @VERSION@
-Requires: @GDK_PACKAGES@
-Libs: -L${libdir} -lgdk-${target}-@GTK_API_VERSION@ @GDK_EXTRA_LIBS@
-Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ -I${libdir}/gtk-@GTK_API_VERSION@/include @GDK_EXTRA_CFLAGS@ -DGSEAL_ENABLE

diff --git a/gtk+-3.0.pc.in b/gtk+-3.0.pc.in
index ccb8c7e1070dc570eceeab6fe5a0f7a05f734173..c68611242811f120498ef8194f89fdb42f12aecd 100644 (file)
--- 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 5b8462a20900e99520557d914cfd79a0afca373a..cbace1af49209e9248293e8ab7b539c4fdce54f6 100644 (file)
--- 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