From 2f9521e58d047f2c857b0b86206878ddf10cbe6f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 26 Apr 2007 06:05:20 +0000 Subject: [PATCH] Don't install UNIX-printing headers and support files on non-UNIX 2007-04-26 Matthias Clasen * Makefile.am: * gtk/Makefile.am: Don't install UNIX-printing headers and support files on non-UNIX platforms. (#425655, Vincent Geddes) svn path=/branches/gtk-2-10/; revision=17652 --- ChangeLog | 8 ++++++++ Makefile.am | 6 +++++- gtk/Makefile.am | 3 ++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 061d304a0c..b0b224fe15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-04-26 Matthias Clasen + + Merged from trunk: + + * Makefile.am: + * gtk/Makefile.am: Don't install UNIX-printing headers and + support files on non-UNIX platforms. (#425655, Vincent Geddes) + 2007-04-26 Matthias Clasen Merged from trunk: diff --git a/Makefile.am b/Makefile.am index 609811405c..ea2a76ef36 100644 --- a/Makefile.am +++ b/Makefile.am @@ -134,7 +134,11 @@ gdk-$(GDKTARGET)-2.0-uninstalled.pc: gdk-2.0-uninstalled.pc cp gdk-2.0-uninstalled.pc gdk-$(GDKTARGET)-2.0-uninstalled.pc pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc gtk+-unix-print-2.0.pc +pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc + +if OS_UNIX +pkgconfig_DATA += gtk+-unix-print-2.0.pc +endif DISTCLEANFILES = \ gtk+-unix-print-2.0.pc \ diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 3fd414fd47..589a211f11 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -317,12 +317,13 @@ gtk_public_h_sources = \ gtkwidget.h \ gtkwindow.h +if OS_UNIX gtk_unix_print_public_h_sources = \ gtkpagesetupunixdialog.h \ gtkprintunixdialog.h \ gtkprinter.h \ gtkprintjob.h - +endif # Installed header files without compatibility guarantees # that are not included in gtk/gtk.h