gnome-control-center/capplets/display/Makefile.am
Søren Sandmann Pedersen 324f02cea3 +Tue Jun 17 19:51:03 2008 S�ren Sandmann <sandmann@redhat.com>
+
+	* Merge randr-12 to trunk
+
+Tue Jun 17 18:29:46 2008  S�ren Sandmann  <sandmann@redhat.com>
+
+	* Port to changes in gnome-desktop
+
+2008-06-04  Federico Mena Quintero  <federico@novell.com>
+
+	* xrandr-capplet.c (driver_is_randr_10): New function, currently
+	unused, to detect whether the graphics driver used in the X server
+	only supports the RANDR 1.0 API.  We may find this information
+	useful to tell the user that not all the features in the capplet
+	will work as intended, or to actually disable features that won't work.
+
+2008-05-29  Federico Mena Quintero  <federico@novell.com>
+
+	* xrandr-capplet.c (apply): Before applying the settings, check if
+	the X server supports the Virtual size we need.
+	(check_required_virtual_size): New function; does the checking
+	against what the X server supports.
+	This still needs to present a friendly dialog box.
+	(compute_virtual_size_for_configuration): New function.
+
+Wed May 14 18:16:10 2008  S�ren Sandmann  <sandmann@redhat.com>
+
+	* xrandr-capplet.c: Add GNOME_DESKTOP_USE_UNSTABLE_API define
+
+	* scrollarea.[ch]: Add copyright statement
+
+2008-05-14  Soren Sandmann Pedersen  <sandmann@redhat.com>
+
+	* *: Check in new RandR 1.2 enabled capplet
+


svn path=/trunk/; revision=8762
2008-06-17 23:52:37 +00:00

56 lines
1.8 KiB
Makefile

# This is used in GNOMECC_CAPPLETS_CFLAGS
cappletname = display
gladedir = $(pkgdatadir)/glade
dist_glade_DATA = display-capplet.glade
bin_PROGRAMS = gnome-display-properties
gnome_display_properties_SOURCES = \
xrandr-capplet.c \
scrollarea.c \
foo-marshal.c \
scrollarea.h \
foo-marshal.h
gnome_display_properties_LDFLAGS = -export-dynamic
gnome_display_properties_LDADD = \
$(DISPLAY_CAPPLET_LIBS) \
$(top_builddir)/capplets/common/libcommon.la
@INTLTOOL_DESKTOP_RULE@
icons16dir = $(datadir)/icons/hicolor/16x16/apps
dist_icons16_DATA = icons/16x16/gnome-display-properties.png
icons22dir = $(datadir)/icons/hicolor/22x22/apps
dist_icons22_DATA = icons/22x22/gnome-display-properties.png
icons24dir = $(datadir)/icons/hicolor/24x24/apps
dist_icons24_DATA = icons/24x24/gnome-display-properties.png
icons32dir = $(datadir)/icons/hicolor/32x32/apps
dist_icons32_DATA = icons/32x32/gnome-display-properties.png
iconssvgdir = $(datadir)/icons/hicolor/scalable/apps
dist_iconssvg_DATA = icons/scalable/gnome-display-properties.svg
desktopdir = $(datadir)/applications
Desktop_in_files = display-properties.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
INCLUDES = $(DISPLAY_CAPPLET_CFLAGS) \
$(GNOMECC_CAPPLETS_CFLAGS) \
-DGLADEDIR="\"$(gladedir)\"" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
install-data-hook: update-icon-cache
uninstall-hook: update-icon-cache
update-icon-cache:
@-if test -z "$(DESTDIR)"; then \
echo "Updating Gtk icon cache."; \
$(gtk_update_icon_cache); \
else \
echo "*** Icon cache not updated. After (un)install, run this:"; \
echo "*** $(gtk_update_icon_cache)"; \
fi