gimp r25200 - in trunk: . plug-ins plug-ins/ico plug-ins/win-icon

[mitch svn gnome org]

Author: mitch
Date: Mon Mar 24 20:13:28 2008
New Revision: 25200
URL: http://svn.gnome.org/viewvc/gimp?rev=25200&view=rev

Log:
2008-03-24  Michael Natterer  <mitch gimp org>

	The icon plugin should simply be "ico" just as the other file
	plug-ins.

	* plug-ins/win-icon -> ico

	* configure.in
	* plug-ins/Makefile.am: changed accordingly.



Added:
   trunk/plug-ins/ico/
      - copied from r25196, /trunk/plug-ins/win-icon/
Removed:
   trunk/plug-ins/win-icon/
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/plug-ins/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Mar 24 20:13:28 2008
@@ -1980,6 +1980,7 @@
 plug-ins/gimpressionist/Presets/Makefile
 plug-ins/help-browser/Makefile
 plug-ins/help/Makefile
+plug-ins/ico/Makefile
 plug-ins/ifs-compose/Makefile
 plug-ins/imagemap/Makefile
 plug-ins/imagemap/images/Makefile
@@ -2004,7 +2005,6 @@
 plug-ins/sgi/Makefile
 plug-ins/twain/Makefile
 plug-ins/uri/Makefile
-plug-ins/win-icon/Makefile
 plug-ins/win-snap/Makefile
 plug-ins/xjt/Makefile
 modules/Makefile

Modified: trunk/plug-ins/Makefile.am
==============================================================================
--- trunk/plug-ins/Makefile.am	(original)
+++ trunk/plug-ins/Makefile.am	Mon Mar 24 20:13:28 2008
@@ -29,7 +29,7 @@
 endif
 
 if HAVE_PNG
-win_icon = win-icon
+ico = ico
 endif
 
 if OS_WIN32
@@ -62,6 +62,7 @@
 	gradient-flare		\
 	help			\
 	$(help_browser)		\
+	$(ico)			\
 	ifs-compose		\
 	imagemap		\
 	$(jpeg)                 \
@@ -76,7 +77,6 @@
 	sgi			\
 	$(twain)		\
 	$(uri)			\
-	$(win_icon)		\
 	$(win_snap)		\
 	$(xjt)			\
 	common