From f6c7b3e5333a78d65a83d2495230045683dd1d49 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Fri, 14 Sep 2012 21:06:26 +0000
Subject: =?UTF-8?q?libgtkui=5Fdirty=20=E2=86=92=20libui=5Fdirty.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/trunk/; revision=44907
---
 Makefile.am        | 2 +-
 ui/Makefile.am     | 8 +++++++-
 ui/gtk/Makefile.am | 8 +-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 13892153c1..62d01d8bf9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -331,8 +331,8 @@ endif
 #
 wireshark_LDADD = \
 	ui/gtk/libgtkui.a		\
-	ui/gtk/libgtkui_dirty.a		\
 	ui/libui.a			\
+	ui/libui_dirty.a		\
 	codecs/libcodec.a		\
 	wiretap/libwiretap.la		\
 	epan/libwireshark.la		\
diff --git a/ui/Makefile.am b/ui/Makefile.am
index 2b722f9f13..f271d1118a 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -29,10 +29,11 @@ if HAVE_WARNINGS_AS_ERRORS
 AM_CLEAN_CFLAGS = -Werror
 endif
 
-noinst_LIBRARIES = libui.a
+noinst_LIBRARIES = libui.a libui_dirty.a
 
 CLEANFILES = \
 	libui.a		\
+	libui_dirty.a	\
 	*~
 
 MAINTAINERCLEANFILES = \
@@ -54,6 +55,11 @@ libui_a_CFLAGS = $(AM_CLEAN_CFLAGS)
 
 libui_a_DEPENDENCIES =
 
+libui_dirty_a_SOURCES = \
+	$(DIRTY_GENERATED_C_FILES)
+
+libui_dirty_a_DEPENDENCIES =
+
 # Common headers
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES)
 
diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am
index a531ba0b38..da9ed2fad0 100644
--- a/ui/gtk/Makefile.am
+++ b/ui/gtk/Makefile.am
@@ -28,11 +28,10 @@ if HAVE_WARNINGS_AS_ERRORS
 AM_CLEAN_CFLAGS = -Werror
 endif
 
-noinst_LIBRARIES = libgtkui.a libgtkui_dirty.a
+noinst_LIBRARIES = libgtkui.a
 
 CLEANFILES = \
 	libgtkui.a		\
-	libgtkui_dirty.a	\
 	*~
 
 MAINTAINERCLEANFILES = \
@@ -71,11 +70,6 @@ libgtkui_a_CFLAGS = $(AM_CLEAN_CFLAGS)
 
 libgtkui_a_DEPENDENCIES =
 
-libgtkui_dirty_a_SOURCES = \
-	$(DIRTY_GENERATED_C_FILES)
-
-libgtkui_dirty_a_DEPENDENCIES =
-
 # Common headers
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap $(PORTAUDIO_INCLUDES)
 
-- 
cgit v1.2.3