--- hugin-0.6/src/nona_gui/Makefile.am.orig	2006-07-23 11:50:10.000000000 +0200
+++ hugin-0.6/src/nona_gui/Makefile.am	2006-08-19 22:22:16.302037250 +0200
@@ -2,7 +2,6 @@
 DEFAULT_INCLUDES="-I."
 INCLUDES    = -I$(top_builddir)/src/include -I${top_srcdir}/src/include -I${top_srcdir}/src/foreign $(WX_CXXFLAGS)
 AM_CXXFLAGS = $(JPEG_FLAGS) $(PNG_FLAGS) $(TIFF_FLAGS) $(ZLIB_FLAGS) $(PANO_FLAGS) $(BOOST_CPPFLAGS) -DINSTALL_XRC_DIR=\"$(datadir)/hugin/xrc\" -DINSTALL_LOCALE_DIR=\"${datadir}/locale\"
-AM_LDFLAGS  = $(WX_LIBS) $(LIB_JPEG) $(LIB_PNG) $(LIB_TIFF) $(LIB_ZLIB) $(LIB_PANO) $(BOOST_THREAD_LIB)
 
 SUFFIXES  = .rc
 
@@ -29,7 +28,8 @@
                    ${top_builddir}/src/jhead/libjhead.la \
 		   ${top_builddir}/src/foreign/vigra_impex/libvigra_impex.la \
                    ${top_builddir}/src/hugin/libhuginwxutils.la \
-                   ${top_builddir}/src/vigra_ext/libvigra_ext.la
+                   ${top_builddir}/src/vigra_ext/libvigra_ext.la \
+		   $(WX_LIBS) $(LIB_JPEG) $(LIB_PNG) $(LIB_TIFF) $(LIB_ZLIB) $(LIB_PANO) $(BOOST_THREAD_LIB)
 
 EXTRA_DIST       = nona_gui_rc.rc nona_gui.vcproj