gimp r26722 - in branches/gimp-2-4: . plug-ins/twain

[neo svn gnome org]

Author: neo
Date: Sat Aug 23 10:32:47 2008
New Revision: 26722
URL: http://svn.gnome.org/viewvc/gimp?rev=26722&view=rev

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

	* plug-ins/twain/Makefile.am: merged changes from trunk (bug 
#548940).



Modified:
   branches/gimp-2-4/ChangeLog
   branches/gimp-2-4/plug-ins/twain/Makefile.am

Modified: branches/gimp-2-4/plug-ins/twain/Makefile.am
==============================================================================
--- branches/gimp-2-4/plug-ins/twain/Makefile.am	(original)
+++ branches/gimp-2-4/plug-ins/twain/Makefile.am	Sat Aug 23 10:32:47 2008
@@ -14,15 +14,14 @@
 
 
 if OS_WIN32
-twain_LDFLAGS = -mwindows
-winlink = -luser32
+twain_LDFLAGS = -mwindows -luser32
 
 twainplatform = tw_win.c
 endif
 
 
 if HAVE_MAC_TWAIN
-maclink = -framework Carbon -framework TWAIN
+twain_LDFLAGS = -framework Carbon -framework TWAIN
 
 twainplatform = tw_mac.c
 
@@ -31,8 +30,6 @@
 endif
 
 
-AM_LDFLAGS = $(winlink) $(maclink)
-
 twain_SOURCES = \
 	tw_func.c	\
 	tw_func.h	\