diff options
| author | Alexander Larsson <alexl@redhat.com> | 2006-04-21 15:09:32 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2006-04-21 15:09:32 +0000 |
| commit | 27f746fbd0e56872a8d3b4bfff2588ad0b7cd7c4 (patch) | |
| tree | dcf0769596bd36a76b7dcea7eed46b378a634f72 /gdk/directfb/Makefile.am | |
| parent | ea32742b93348e1ce47cd92a26afe5317b37dd73 (diff) | |
| download | gtk+-27f746fbd0e56872a8d3b4bfff2588ad0b7cd7c4.tar.gz | |
Merge the gtk-printing branch. For more detailed ChangeLog entries, see
2006-04-21 Alexander Larsson <alexl@redhat.com>
Merge the gtk-printing branch.
For more detailed ChangeLog entries, see the branch.
* .cvsignore:
* Makefile.am:
* configure.in:
* docs/tools/widgets.c:
* gtk+-unix-print-2.0.pc.in:
* gtk/Makefile.am:
* gtk/gen-paper-names.c:
* gtk/gtk.h:
* gtk/gtk.symbols:
* gtk/gtkenums.h:
* gtk/gtkiconfactory.c:
* gtk/gtkmarshalers.list:
* gtk/gtkpagesetup.[ch]:
* gtk/gtkpagesetupunixdialog.[ch]:
* gtk/gtkpapersize.[ch]:
* gtk/gtkprint-win32.[ch]:
* gtk/gtkprintbackend.[ch]:
* gtk/gtkprintcontext.[ch]:
* gtk/gtkprinter-private.h:
* gtk/gtkprinter.[ch]:
* gtk/gtkprinteroption.[ch]:
* gtk/gtkprinteroptionset.[ch]:
* gtk/gtkprinteroptionwidget.[ch]:
* gtk/gtkprintjob.[ch]:
* gtk/gtkprintoperation-private.h:
* gtk/gtkprintoperation-unix.c:
* gtk/gtkprintoperation-win32.c:
* gtk/gtkprintoperation.[ch]:
* gtk/gtkprintsettings.[ch]:
* gtk/gtkprintunixdialog.[ch]:
* gtk/paper_names.c:
* gtk/paper_names_offsets.c:
Platform independent printing API and implementations
for unix and windows.
* gtk/gtkstock.h:
* gtk/stock-icons/24/gtk-orientation-landscape.png:
* gtk/stock-icons/24/gtk-orientation-portrait.png:
* gtk/stock-icons/24/gtk-orientation-reverse-landscape.png:
Add stock icons for page orientation.
* modules/Makefile.am:
* modules/printbackends/Makefile.am:
* modules/printbackends/cups/Makefile.am:
* modules/printbackends/cups/gtkcupsutils.[ch]:
* modules/printbackends/cups/gtkprintbackendcups.[ch]:
* modules/printbackends/cups/gtkprintercups.[ch]:
Cups printing backend for unix.
* modules/printbackends/lpr/Makefile.am:
* modules/printbackends/lpr/gtkprintbackendlpr.[ch]:
lpr printing backend for unix.
* modules/printbackends/pdf/Makefile.am:
* modules/printbackends/pdf/gtkprintbackendpdf.[ch]:
print-to-pdf printing backend for unix.
* tests/.cvsignore:
* tests/Makefile.am:
* tests/print-editor.c:
Test application for printing.
* gdk/gdk.symbols:
* gdk/win32/gdkevents-win32.c:
* gdk/win32/gdkwin32.h:
Add gdk_win32_set_modal_dialog_libgtk_only so that we can pump the
mainloop while displaying a win32 common dialog.
* gdk/directfb/Makefile.am:
Whitespace cleanup.
Diffstat (limited to 'gdk/directfb/Makefile.am')
| -rw-r--r-- | gdk/directfb/Makefile.am | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gdk/directfb/Makefile.am b/gdk/directfb/Makefile.am index 7046e9a0c2..97a2498dac 100644 --- a/gdk/directfb/Makefile.am +++ b/gdk/directfb/Makefile.am @@ -1,7 +1,6 @@ ## Makefile.am for gtk+/gdk/gdk-directfb libgdkincludedir = $(includedir)/gtk-2.0/gdk -libgdkgdk_directfbincludedir = $(includedir)/gtk-2.0/gdk/gdk-directfb INCLUDES = \ -DG_LOG_DOMAIN=\"Gdk-DirectFB\" \ @@ -23,8 +22,8 @@ libgdk_directfb_la_SOURCES = \ gdkcolor-directfb.c \ gdkcursor-directfb.c \ gdkdnd-directfb.c \ - gdkdisplay-directfb.c \ - gdkdisplay-directfb.h \ + gdkdisplay-directfb.c \ + gdkdisplay-directfb.h \ gdkdrawable-directfb.c \ gdkevents-directfb.c \ gdkfont-directfb.c \ @@ -50,8 +49,8 @@ libgdk_directfb_la_SOURCES = \ x-cursors.xbm libgdkinclude_HEADERS = \ - gdkdirectfb.h \ + gdkdirectfb.h \ gdkprivate-directfb.h -EXTRA_DIST = AUTHORS README TODO ChangeLog +EXTRA_DIST = AUTHORS README TODO |