AAAAARGH. Making the UI libs platform-dependent breaks dependency

checking, so if a UI library changes Wireshark won't be relinked with
it.  Revert the change that made them platform-dependent; we may end up
having to have separate targets for GTK+ Wireshark and Qt Wireshark.

svn path=/trunk/; revision=43384

Makefile.am

@@ -313,7 +313,8 @@ endif
 # @GTK_LIBS@ (as those are also needed for X applications, and GTK+
 # applications are X applications).
 wireshark_LDADD = \
-	@UI_LIBS@			\
+	ui/gtk/libgtkui.a		\
+	ui/gtk/libgtkui_dirty.a		\
 	ui/libui.a			\
 	codecs/libcodec.a		\
 	wiretap/libwiretap.la		\
@@ -332,7 +333,7 @@ wireshark_LDADD = \
 	@LIBGNUTLS_LIBS@		\
 	@LIBSMI_LDFLAGS@		\
 	@PORTAUDIO_LIBS@		\
-	-lm
+	@GTK_LIBS@ -lm
 
 wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
 

configure.in

@@ -918,7 +918,6 @@ if test "$have_gtk" = "no" ; then
 		wireshark_bin="wireshark\$(EXEEXT)"
 		wireshark_man="wireshark.1"
 	        wireshark_SUBDIRS="codecs ui/qt"
-		UI_LIBS="ui/qt/libqtui.a $Qt_LIBS"
 	else
 		#
 		# We don't have Qt, either, which means we have no UI
@@ -970,9 +969,7 @@ else
 		# (Versions prior to 2.22 lacked some necessary accessors.)
 		CPPFLAGS="-DGSEAL_ENABLE $CPPFLAGS"
 	fi
-	UI_LIBS="ui/gtk/libgtkui.a ui/gtk/libgtkui_dirty.a $GTK_LIBS"
 fi
-AC_SUBST(UI_LIBS)
 
 # Error out if a glib header other than a "top level" header
 #  (glib.h, glib-object.h, gio.h) or certain other headers( e.g.,gmodule.h)