diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2007-04-26 06:03:54 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2007-04-26 06:03:54 +0000 |
| commit | 41bf952556edb8cda5a4a535338c27492af43a66 (patch) | |
| tree | 8bc3de70d4ddfe1f55a25adc98e960a91cd5570c | |
| parent | 2a29ec5176d30e1c83e8b506c795181955e61159 (diff) | |
| download | gtk+-41bf952556edb8cda5a4a535338c27492af43a66.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | gtk/Makefile.am | 3 |
3 files changed, 13 insertions, 2 deletions
@@ -1,5 +1,11 @@ 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 unnamed separators. (#369112, Christian Persch) 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 ce5d48f369..e86e713d6b 100644 --- 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 |