diff options
| -rw-r--r-- | Makefile.am | 48 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | gdk-3.0-uninstalled.pc.in | 8 | ||||
| -rw-r--r-- | gdk-3.0.pc.in | 12 | ||||
| -rw-r--r-- | gtk+-3.0.pc.in | 6 | ||||
| -rw-r--r-- | gtk+-unix-print-3.0.pc.in | 2 |
6 files changed, 11 insertions, 67 deletions
diff --git a/Makefile.am b/Makefile.am index 14444964fd..68002d7745 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 07e95691bd..9ff5b67050 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/gdk-3.0-uninstalled.pc.in b/gdk-3.0-uninstalled.pc.in deleted file mode 100644 index 45adcf0f06..0000000000 --- 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 index fe21977748..0000000000 --- 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 ccb8c7e107..c686112428 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 5b8462a209..cbace1af49 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 |