gnome-themes r1456 - in branches/hc-naming: . icon-themes/HighContrastLargePrint/48x48/apps icon-themes/HighContrastLargePrint/48x48/devices icon-themes/HighContrastLargePrint/48x48/mimetypes icon-themes/HighContrastLargePrint/48x48/places icon-themes/HighContrastLargePrintInverse/36x36 icon-themes/HighContrastLargePrintInverse/36x36/animations icon-themes/HighContrastLargePrintInverse/48x48 icon-themes/HighContrastLargePrintInverse/48x48/actions icon-themes/HighContrastLargePrintInverse/48x48/apps icon-themes/HighContrastLargePrintInverse/48x48/categories icon-themes/HighContrastLargePrintInverse/48x48/devices icon-themes/HighContrastLargePrintInverse/48x48/emblems icon-themes/HighContrastLargePrintInverse/48x48/filesystems icon-themes/HighContrastLargePrintInverse/48x48/mimetypes icon-themes/HighContrastLargePrintInverse/48x48/places icon-themes/HighContrastLargePrintInverse/48x48/status

[calum svn gnome org]

Author: calum
Date: Thu May 29 12:07:16 2008
New Revision: 1456
URL: http://svn.gnome.org/viewvc/gnome-themes?rev=1456&view=rev

Log:
First pass at updated makefiles for HCLPI theme, plus fix a few
inconsistencies between HCLP and HCLPI themes.  symlinks.dat stuff
still broken for now.


Added:
   branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/apps/smc.png
      - copied, changed from r1455, /branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/apps/smc.png
   branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/devices/drive-removable-media.png
      - copied, changed from r1455, /branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/devices/drive-removable-media.png
   branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/devices/media-optical.png
      - copied, changed from r1455, /branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/devices/media-optical.png
   branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/mimetypes/font-x-generic.png
      - copied, changed from r1455, /branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/font-x-generic.png
   branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/mimetypes/package-x-generic.png
      - copied, changed from r1455, /branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/package-x-generic.png
   branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/mimetypes/x-office-address-book.png
      - copied, changed from r1455, /branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/x-office-address-book.png
   branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/places/network-server.png
      - copied, changed from r1455, /branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/places/network-server.png
   branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/places/start-here.png
      - copied, changed from r1455, /branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/places/start-here.png
   branches/hc-naming/icon-themes/HighContrastLargePrintInverse/36x36/animations/Makefile.am
   branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/actions/Makefile.am
   branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/apps/start-here.png   (contents, props changed)
   branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/categories/Makefile.am
      - copied, changed from r1455, /branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/categories/Makefile.am
   branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/symlinks.dat
      - copied unchanged from r1455, /branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/mimetypes/symlinks.dat
Removed:
   branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/mimetypes/gnome-compressed.png
   branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/mimetypes/gnome-library.png
   branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-executable.png
   branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application.png
   branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-troff-man.png
   branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/mimetypes/gnome-mime-x-font.png
   branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/filesystems/
Modified:
   branches/hc-naming/ChangeLog
   branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/apps/Makefile.am
   branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/devices/Makefile.am
   branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/mimetypes/Makefile.am
   branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/places/Makefile.am
   branches/hc-naming/icon-themes/HighContrastLargePrintInverse/36x36/Makefile.am
   branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/apps/Makefile.am
   branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/devices/Makefile.am
   branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/emblems/Makefile.am
   branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/Makefile.am
   branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/places/Makefile.am
   branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/status/Makefile.am

Modified: branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/apps/Makefile.am
==============================================================================
--- branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/apps/Makefile.am	(original)
+++ branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/apps/Makefile.am	Thu May 29 12:07:16 2008
@@ -63,6 +63,7 @@
 		preferences-desktop-wallpaper.png \
 		preferences-system-session.png \
 		preferences-system-windows.png \
+		smc.png \
 		star.png \
 		start-here.png \
 		symlinks.dat

Copied: branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/apps/smc.png (from r1455, /branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/apps/smc.png)
==============================================================================
Binary files. No diff available.

Modified: branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/devices/Makefile.am
==============================================================================
--- branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/devices/Makefile.am	(original)
+++ branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/devices/Makefile.am	Thu May 29 12:07:16 2008
@@ -6,11 +6,13 @@
 		computer.png \
 		drive-harddisk.png \
 		drive-optical.png \
+		drive-removable-media.png \
 		gnome-dev-printer-network.png \
 		gnome-dev-printer-new.png \
 		input-keyboard.png \
 		input-mouse.png \
 		media-floppy.png \
+		media-optical.png \
 		printer.png \
 		$(NULL)
 

Copied: branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/devices/drive-removable-media.png (from r1455, /branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/devices/drive-removable-media.png)
==============================================================================
Binary files. No diff available.

Copied: branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/devices/media-optical.png (from r1455, /branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/devices/media-optical.png)
==============================================================================
Binary files. No diff available.

Modified: branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/mimetypes/Makefile.am
==============================================================================
--- branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/mimetypes/Makefile.am	(original)
+++ branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/mimetypes/Makefile.am	Thu May 29 12:07:16 2008
@@ -5,18 +5,14 @@
 icon_DATA=	\
 		application-x-executable.png \
 		audio-x-generic.png \
-		gnome-compressed.png \
-		gnome-library.png \
+		font-x-generic.png \
 		gnome-mime-application-x-core-file.png \
-		gnome-mime-application-x-executable.png \
-		gnome-mime-application.png \
-		gnome-mime-text-x-troff-man.png \
-		gnome-mime-x-font.png \
 		image-x-generic.png \
-		symlinks.dat
+		package-x-generic.png \
 		text-x-generic.png \
 		text-x-preview.png \
 		video-x-generic.png \
+		x-office-address-book.png \
 		$(NULL)
 
 EXTRA_DIST=	$(icon_DATA) \

Copied: branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/mimetypes/font-x-generic.png (from r1455, /branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/font-x-generic.png)
==============================================================================
Binary files. No diff available.

Copied: branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/mimetypes/package-x-generic.png (from r1455, /branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/package-x-generic.png)
==============================================================================
Binary files. No diff available.

Copied: branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/mimetypes/x-office-address-book.png (from r1455, /branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/x-office-address-book.png)
==============================================================================
Binary files. No diff available.

Modified: branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/places/Makefile.am
==============================================================================
--- branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/places/Makefile.am	(original)
+++ branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/places/Makefile.am	Thu May 29 12:07:16 2008
@@ -6,7 +6,9 @@
 		folder-remote.png \
 		folder.icon \
 		folder.png \
+		network-server.png \
 		network-workgroup.png \
+		start-here.png \
 		user-desktop.png \
 		user-home.png \
 		user-trash.png \

Copied: branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/places/network-server.png (from r1455, /branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/places/network-server.png)
==============================================================================
Binary files. No diff available.

Copied: branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/places/start-here.png (from r1455, /branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/places/start-here.png)
==============================================================================
Binary files. No diff available.

Modified: branches/hc-naming/icon-themes/HighContrastLargePrintInverse/36x36/Makefile.am
==============================================================================
--- branches/hc-naming/icon-themes/HighContrastLargePrintInverse/36x36/Makefile.am	(original)
+++ branches/hc-naming/icon-themes/HighContrastLargePrintInverse/36x36/Makefile.am	Thu May 29 12:07:16 2008
@@ -1 +1 @@
-SUBDIRS= animations apps 
+SUBDIRS= animations 

Added: branches/hc-naming/icon-themes/HighContrastLargePrintInverse/36x36/animations/Makefile.am
==============================================================================
--- (empty file)
+++ branches/hc-naming/icon-themes/HighContrastLargePrintInverse/36x36/animations/Makefile.am	Thu May 29 12:07:16 2008
@@ -0,0 +1,10 @@
+NULL=
+
+icondir=	$(datadir)/icons/HighContrastLargePrintInverse/36x36/animations/
+
+icon_DATA=	\
+		process-idle.png \
+		process-working.png \
+		$(NULL)
+
+EXTRA_DIST=	$(icon_DATA)

Added: branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/actions/Makefile.am
==============================================================================
--- (empty file)
+++ branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/actions/Makefile.am	Thu May 29 12:07:16 2008
@@ -0,0 +1,11 @@
+NULL=
+
+icondir=	$(datadir)/icons/HighContrastLargePrintInverse/48x48/actions/
+
+icon_DATA=	\
+		system-log-out.png \
+		system-run.png \
+		system-search.png \
+		$(NULL)
+
+EXTRA_DIST=	$(icon_DATA) 

Modified: branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/apps/Makefile.am
==============================================================================
--- branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/apps/Makefile.am	(original)
+++ branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/apps/Makefile.am	Thu May 29 12:07:16 2008
@@ -3,89 +3,80 @@
 icondir=	$(datadir)/icons/HighContrastLargePrintInverse/48x48/apps/
 
 icon_DATA=	\
-                accessibility-directory.png \
-                advanced-directory.png \
+		accessibility-directory.png \
+		accessories-character-map.png \
+		advanced-directory.png \
 		ax-applet.png \
-                charpick.png \
+		charpick.png \
+		clock.png \
 		display-capplet.png \
 		evolution-1.4.png \
-		file-manager.png \
-                file-roller.png \
-                gcalctool.png \
+		file-roller.png \
+		gcalctool.png \
 		gdict.png \
-                gedit-icon.png \
-                gkb.png \
+		gedit-icon.png \
+		gkb.png \
 		gnome-application-generic.png \
+		gnome-audio2.png \
+		gnome-calc3.png \
+		gnome-ccmime.png \
+		gnome-ccscreensaver.png \
+		gnome-cd.png \
+		gnome-cdplayer-icon.png \
+		gnome-eog.png \
 		gnome-folder-generic.png \
-                gnome-applications.png \
-                gnome-audio2.png \
-                gnome-calc3.png \
-                gnome-ccmime.png \
-                gnome-ccscreensaver.png \
-                gnome-cdplayer-icon.png \
-                gnome-cd.png \
-                gnome-character-map.png \
-                clock.png \
-                gnome-devel.png \
-                gnome-eog.png \
-                gnome-ghex.png  \
-                gnome-ghostview.png \
-                gnome-globe.png \
-                gnome-graphics.png \
-                gnome-grecord.png \
-                gnome-help.png  \
-                gnome-home.png \
-                gnome-joystick.png \
-                gnome-log.png \
-		gnome-logout.png \
+		gnome-ghex.png \
+		gnome-ghostview.png \
+		gnome-grecord.png \
+		gnome-home.png \
+		gnome-info.png \
+		gnome-log.png \
 		gnome-logo-icon-transparent.png \
-                gnome-mailcheck.png \
-                gnome-mini-commander.png \
-		gnome-mixer.png \
-                gnome-mixer-applet.png \
-                gnome-mixer.png \
-                gnome-multimedia.png \
-                gnome-panel.png \
-		gnome-run.png \
+		gnome-mailcheck.png \
+		gnome-mini-commander.png \
+		gnome-mixer-applet.png \
+		gnome-panel.png \
 		gnome-screenshot.png \
-		gnome-searchtool.png \
 		gnome-searchtool-animation-rest.png \
 		gnome-searchtool-animation.png \
-                gnome-session.png \
-                gnome-settings-accessibility-keyboard.png \
-                gnome-settings-accessibility-technologies.png \
-                gnome-settings-background.png \
-                gnome-settings-default-applications.png \
-                gnome-settings-font.png \
-                gnome-settings-keybindings.png \
-                gnome-settings.png \
-                gnome-settings-sound.png \
-                gnome-settings-theme.png \
+		gnome-settings-accessibility-keyboard.png \
+		gnome-settings-default-applications.png \
 		gnome-settings-ui-behavior.png \
-                gnome-starthere.png \
-                gnome-system.png \
-                gnome-terminal.png \
-                gnome-util.png \
-                gnome-window-manager.png \
-                gnome-windows.png \
-                gnome-workspace.png \
-                gucharmap.png \
+		gnome-starthere.png \
+		gnome-windows.png \
+		gnome-workspace.png \
+		gucharmap.png \
+		help-browser.png \
 		keyboard.png \
-                launcher-program.png \
+		launcher-program.png \
 		mozilla-icon.png \
+		multimedia-volume-control.png \
 		orca.png \
 		panel-drawer.png \
 		panel-force-quit.png \
-                perfmeter.png \
+		perfmeter.png \
+		preferences-desktop-accessibility.png \
+		preferences-desktop-font.png \
+		preferences-desktop-keyboard-shortcuts.png \
+		preferences-desktop-sound.png \
+		preferences-desktop-theme.png \
+		preferences-desktop-wallpaper.png \
+		preferences-system-session.png \
+		preferences-system-windows.png \
+		smc.png \
 		star.png \
-                window-capplet.png \
+		start-here.png \
+		symlinks.dat
+		system-file-manager.png \
+		utilities-terminal.png \
+		window-capplet.png \
 		$(NULL)
 
 EXTRA_DIST=	$(icon_DATA) \
 		symlinks.dat
 
 install: install-am
-	$(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir)
+	$(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir) 
  
 uninstall-symlinks:
 	list=`ls $(DESTDIR)$(icondir)`; for p in $$list; do \

Added: branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/apps/start-here.png
==============================================================================
Binary file. No diff available.

Copied: branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/categories/Makefile.am (from r1455, /branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/categories/Makefile.am)
==============================================================================
--- /branches/hc-naming/icon-themes/HighContrastLargePrint/48x48/categories/Makefile.am	(original)
+++ branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/categories/Makefile.am	Thu May 29 12:07:16 2008
@@ -1,6 +1,6 @@
 NULL=
 
-icondir=	$(datadir)/icons/HighContrastLargePrint/48x48/categories/
+icondir=	$(datadir)/icons/HighContrastLargePrintInverse/48x48/categories/
 
 icon_DATA=	\
 		applications-accessories.png \

Modified: branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/devices/Makefile.am
==============================================================================
--- branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/devices/Makefile.am	(original)
+++ branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/devices/Makefile.am	Thu May 29 12:07:16 2008
@@ -1,38 +1,32 @@
 NULL=
 
-themedir =  $(datadir)/icons/HighContrastLargePrintInverse
-size = 48x48
-context = devices
-
-icondir = $(themedir)/$(size)/$(context)
-
-icon_DATA = \
-	computer.png \
-	drive-harddisk.png \
-	drive-optical.png \
-	drive-removable-media.png \
-	input-keyboard.png \
-	input-mouse.png \
-	media-floppy.png \
-	media-optical.png \
-	printer.png \
-	$(NULL)
-
-EXTRA_DIST = \
-	$(icon_DATA)
-	$(NULL)
-
-install-data-local: install-iconDATA
-	if  test -n "$(ICONMAP)" ; then \
-		(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context)) ; \
-	fi
+icondir=	$(datadir)/icons/HighContrastLargePrintInverse/48x48/devices/
+
+icon_DATA=	\
+		computer.png \
+		drive-harddisk.png \
+		drive-optical.png \
+		drive-removable-media.png \
+		gnome-dev-printer-network.png \
+		gnome-dev-printer-new.png \
+		input-keyboard.png \
+		input-mouse.png \
+		media-floppy.png \
+		media-optical.png \
+		printer.png \
+		$(NULL)
+
+EXTRA_DIST=	$(icon_DATA) \
+		symlinks.dat
+
+install: install-am
+	$(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir)
 
 uninstall-symlinks:
-	list=`ls $(DESTDIR)$(themedir)/$(size)/$(context)`; \
-	for p in $$list; do \
-		if test -h $(DESTDIR)$(themedir)/$(size)/$(context)/$$p; then \
-			rm -f $(DESTDIR)$(themedir)/$(size)/$(context)/$$p; \
-		fi; \
+	list=`ls $(DESTDIR)$(icondir)`; for p in $$list; do \
+	if test -h $(DESTDIR)$(icondir)/$$p; then \
+		rm -f $(DESTDIR)$(icondir)/$$p; \
+	fi; \
 	done
 
 uninstall-am: uninstall-iconDATA uninstall-symlinks

Modified: branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/emblems/Makefile.am
==============================================================================
--- branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/emblems/Makefile.am	(original)
+++ branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/emblems/Makefile.am	Thu May 29 12:07:16 2008
@@ -3,10 +3,10 @@
 icondir=	$(datadir)/icons/HighContrastLargePrintInverse/48x48/emblems/
 
 icon_DATA=	\
-		emblem-noread.png \
-                emblem-special.png \
-                emblem-important.png \
-                emblem-personal.png \
+		emblem-important.png \
+		emblem-personal.png \
+		emblem-special.png \
+		emblem-unreadable.png \
 		$(NULL)
 
 EXTRA_DIST=	$(icon_DATA)

Modified: branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/Makefile.am
==============================================================================
--- branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/Makefile.am	(original)
+++ branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/Makefile.am	Thu May 29 12:07:16 2008
@@ -1,39 +1,31 @@
-NULL =
-themedir =  $(datadir)/icons/HighContrastLargePrintInverse
-size = 48x48
-context = mimetypes
-
-icondir = $(themedir)/$(size)/$(context)
-
-icon_DATA =	\
-	application-x-executable.png \
-	audio-x-generic.png \
-	font-x-generic.png \
-	gnome-mime-application-x-core-file.png \
-	image-x-generic.png \
-	text-x-generic.png \
-	text-x-preview.png \
-	package-x-generic.png \
-	video-x-generic.png \
-	x-office-address-book.png \
-	$(NULL)
-
-EXTRA_DIST = \
-	$(icon_DATA) \
-	$(NULL)
-
-install-data-local: install-iconDATA
-	if  test -n "$(ICONMAP)" ; then \
-		(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context)) ; \
-	fi
+NULL=
 
+icondir=	$(datadir)/icons/HighContrastLargePrintInverse/48x48/mimetypes
+
+icon_DATA=	\
+		application-x-executable.png \
+		audio-x-generic.png \
+		font-x-generic.png \
+		gnome-mime-application-x-core-file.png \
+		image-x-generic.png \
+		package-x-generic.png \
+		text-x-generic.png \
+		text-x-preview.png \
+		video-x-generic.png \
+		x-office-address-book.png \
+		$(NULL)
+
+EXTRA_DIST=	$(icon_DATA) \
+		symlinks.dat
+
+install: install-am
+	$(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir)
 
 uninstall-symlinks:
-	list=`ls $(DESTDIR)$(themedir)/$(size)/$(context)`; \
-	for p in $$list; do \
-		if test -h $(DESTDIR)$(themedir)/$(size)/$(context)/$$p; then \
-			rm -f $(DESTDIR)$(themedir)/$(size)/$(context)/$$p; \
-		fi; \
-	done
+	list=`ls $(DESTDIR)$(icondir)`; for p in $$list; do \
+	if test -h $(DESTDIR)$(icondir)/$$p; then \
+		rm -f $(DESTDIR)$(icondir)/$$p; \
+	fi; \
+done
 
 uninstall-am: uninstall-iconDATA uninstall-symlinks

Modified: branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/places/Makefile.am
==============================================================================
--- branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/places/Makefile.am	(original)
+++ branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/places/Makefile.am	Thu May 29 12:07:16 2008
@@ -1,36 +1,17 @@
-themedir =  $(datadir)/icons/HighContrastLargePrintInverse
-size = 48x48
-context = places
+NULL=
 
-icondir = $(themedir)/$(size)/$(context)
+icondir=	$(datadir)/icons/HighContrastLargePrintInverse/48x48/places/
 
-icon_DATA =					\
-	folder.png				\
-	folder.icon				\
-	folder-remote.png			\
-	network-server.png			\
-	network-workgroup.png			\
-	start-here.png				\
-	user-desktop.png			\
-	user-home.png				\
-	user-trash.png				\
-	$(NULL)
+icon_DATA=	\
+		folder-remote.png \
+		folder.icon \
+		folder.png \
+		network-server.png \
+		network-workgroup.png \
+		start-here.png \
+		user-desktop.png \
+		user-home.png \
+		user-trash.png \
+		$(NULL)
 
-EXTRA_DIST =					\
-	$(icon_DATA)
-
-install-data-local: install-iconDATA
-	if  test -n "$(ICONMAP)" ; then \
-		(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context)) ; \
-	fi
-
-
-uninstall-symlinks:
-	list=`ls $(DESTDIR)$(themedir)/$(size)/$(context)`; \
-	for p in $$list; do \
-		if test -h $(DESTDIR)$(themedir)/$(size)/$(context)/$$p; then \
-			rm -f $(DESTDIR)$(themedir)/$(size)/$(context)/$$p; \
-		fi; \
-	done
-
-uninstall-am: uninstall-iconDATA uninstall-symlinks
+EXTRA_DIST=	$(icon_DATA)

Modified: branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/status/Makefile.am
==============================================================================
--- branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/status/Makefile.am	(original)
+++ branches/hc-naming/icon-themes/HighContrastLargePrintInverse/48x48/status/Makefile.am	Thu May 29 12:07:16 2008
@@ -1,30 +1,11 @@
-themedir =  $(datadir)/icons/HighContrastLargePrintInverse
-size = 48x48
-context = status
+NULL=
 
-icondir = $(themedir)/$(size)/$(context)
+icondir=	$(datadir)/icons/HighContrastLargePrintInverse/48x48/status/
 
-icon_DATA =					\
-	folder-drag-accept.png			\
-	folder-drag-accept.icon			\
-	user-trash-full.png			\
-	$(NULL)
+icon_DATA=	\
+		folder-drag-accept.icon \
+		folder-drag-accept.png \
+		user-trash-full.png \
+		$(NULL)
 
-EXTRA_DIST =					\
-	$(icon_DATA)
-
-install-data-local: install-iconDATA
-	if  test -n "$(ICONMAP)" ; then \
-		(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context)) ; \
-	fi
-
-
-uninstall-symlinks:
-	list=`ls $(DESTDIR)$(themedir)/$(size)/$(context)`; \
-	for p in $$list; do \
-		if test -h $(DESTDIR)$(themedir)/$(size)/$(context)/$$p; then \
-			rm -f $(DESTDIR)$(themedir)/$(size)/$(context)/$$p; \
-		fi; \
-	done
-
-uninstall-am: uninstall-iconDATA uninstall-symlinks
+EXTRA_DIST=	$(icon_DATA)