Don't install UNIX-printing headers and support files on non-UNIX

2007-04-26  Matthias Clasen  <mclasen@redhat.com>

        * Makefile.am:
        * gtk/Makefile.am: Don't install UNIX-printing headers and
        support files on non-UNIX platforms.  (#425655, Vincent Geddes)

svn path=/trunk/; revision=17651

diff --git a/ChangeLog b/ChangeLog
index bd50b7c7bf7902262237ac15bf553674d204dc1e..1266eb293976ed6b2355ad5176c768b83373bb2f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-26  Matthias Clasen  <mclasen@redhat.com>
+
+       * 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  <mclasen@redhat.com>
 
        * gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Accept

diff --git a/Makefile.am b/Makefile.am
index 609811405c03dfb4e1db692dda3d2ccdddc206e3..ea2a76ef36d476adf708458baaad2cd2f70e8091 100644 (file)
--- 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 ce5d48f369e0de0f899e1a487ca78608fe125f7a..e86e713d6b0c1d2701f88ac6b39744daedf8e393 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -319,12 +319,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