From 7aa336b993f68a5d25e82068a360f27521d446bd Mon Sep 17 00:00:00 2001
From: riccardom <riccardom@users.sf.net>
Date: Wed, 12 May 2010 16:36:20 +0000
Subject: [PATCH] Marge r3628 and r3629 from trunk

Fixup make distcheck by adding wx directory to
DIST_SUBDIRS and adding wx frontend related files which
have unused translations to the skip list.
---
 desmume/po/POTFILES.skip | 2 ++
 desmume/src/Makefile.am  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 desmume/po/POTFILES.skip

diff --git a/desmume/po/POTFILES.skip b/desmume/po/POTFILES.skip
new file mode 100644
index 000000000..579fb8ed3
--- /dev/null
+++ b/desmume/po/POTFILES.skip
@@ -0,0 +1,2 @@
+src/wx/PadSimple/GUI/ConfigDlg.cpp
+src/wxdlg/wxdlg3dViewer.cpp
diff --git a/desmume/src/Makefile.am b/desmume/src/Makefile.am
index cc5913143..174c62e3a 100644
--- a/desmume/src/Makefile.am
+++ b/desmume/src/Makefile.am
@@ -8,7 +8,7 @@ SUBDIRS = . gdbstub $(UI_DIR)
 else
 SUBDIRS = . $(UI_DIR)
 endif
-DIST_SUBDIRS = . gdbstub cli cocoa gtk gtk-glade
+DIST_SUBDIRS = . gdbstub cli cocoa gtk gtk-glade wx
 noinst_LIBRARIES = libdesmume.a
 libdesmume_a_SOURCES = \
 	armcpu.cpp armcpu.h \