gimp r26499 - in trunk: . plug-ins/common

[neo svn gnome org]

Author: neo
Date: Mon Aug 11 15:05:23 2008
New Revision: 26499
URL: http://svn.gnome.org/viewvc/gimp?rev=26499&view=rev

Log:
2008-08-11  Sven Neumann  <sven gimp org>

	* plug-ins/common/plugin-defs.pl: removed the LIBFOO hack from
	this script.
	
	* plug-ins/common/mkgen.pl: explicitely specify the libs in the
	two places where it wasn't done yet.

	* plug-ins/common/Makefile.am: regenerated.



Modified:
   trunk/ChangeLog
   trunk/plug-ins/common/Makefile.am
   trunk/plug-ins/common/mkgen.pl
   trunk/plug-ins/common/plugin-defs.pl

Modified: trunk/plug-ins/common/Makefile.am
==============================================================================
--- trunk/plug-ins/common/Makefile.am	(original)
+++ trunk/plug-ins/common/Makefile.am	Mon Aug 11 15:05:23 2008
@@ -1717,7 +1717,6 @@
 	$(libgimpcolor)		\
 	$(libgimpbase)		\
 	$(GTK_LIBS)		\
-	$(MAIL_LIBS)		\
 	$(RT_LIBS)		\
 	$(INTLLIBS)
 

Modified: trunk/plug-ins/common/mkgen.pl
==============================================================================
--- trunk/plug-ins/common/mkgen.pl	(original)
+++ trunk/plug-ins/common/mkgen.pl	Mon Aug 11 15:05:23 2008
@@ -138,9 +138,6 @@
     if (exists $plugins{$_}->{optional}) {
 	if (exists $plugins{$_}->{libs}) {
 		$optlib = "\n\t\$(" . $plugins{$_}->{libs} . ")\t\t\\";
-	} else {
-		my $name = exists $plugins{$_}->{libopt} ? $plugins{$_}->{libopt} : $_;
-		$optlib = "\n\t\$(\U$name\E_LIBS)\t\t\\";
 	}
     }
 

Modified: trunk/plug-ins/common/plugin-defs.pl
==============================================================================
--- trunk/plug-ins/common/plugin-defs.pl	(original)
+++ trunk/plug-ins/common/plugin-defs.pl	Mon Aug 11 15:05:23 2008
@@ -90,7 +90,7 @@
     'illusion' => { ui => 1 },
     'iwarp' => { ui => 1 },
     'jigsaw' => { ui => 1 },
-    'lcms' => { ui => 1, optional => 1 },
+    'lcms' => { ui => 1, optional => 1, libs => 'LCMS_LIBS' },
     'lens-apply' => { ui => 1 },
     'lens-distortion' => { ui => 1 },
     'lens-flare' => { ui => 1 },
@@ -117,7 +117,7 @@
     'ripple' => { ui => 1 },
     'rotate' => {},
     'sample-colorize' => { ui => 1 },
-    'screenshot' => { ui => 1, optional => 1, cflags => XFIXES_CFLAGS },
+    'screenshot' => { ui => 1, optional => 1, libs => 'SCREENSHOT_LIBS', cflags => 'XFIXES_CFLAGS' },
     'semi-flatten' => {},
     'sharpen' => { ui => 1 },
     'shift' => { ui => 1 },