From f189de5bf761c1256b39a2e9eea709167e450188 Mon Sep 17 00:00:00 2001 From: yabause Date: Mon, 9 Apr 2012 07:38:24 +0000 Subject: [PATCH] Merged revision 4245 from trunk. (not sure why it's updating properties on so many files... stupid SVN...) --- desmume/Makefile.am | 2 +- desmume/src/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/desmume/Makefile.am b/desmume/Makefile.am index 61e9e9a00..c059490bf 100644 --- a/desmume/Makefile.am +++ b/desmume/Makefile.am @@ -1,4 +1,4 @@ -EXTRA_DIST = README.LIN README.MAC README.WIN README.TRANSLATION dsm.txt dsv.txt autogen.sh \ +EXTRA_DIST = README.LIN README.MAC README.WIN dsm.txt dsv.txt autogen.sh \ $(PO_FILES_IN) DISTCLEANFILES = $(PO_FILES) SUBDIRS = $(PO_DIR) src diff --git a/desmume/src/Makefile.am b/desmume/src/Makefile.am index e0f99570a..235b25557 100644 --- a/desmume/src/Makefile.am +++ b/desmume/src/Makefile.am @@ -2,13 +2,13 @@ include $(top_srcdir)/src/desmume.mk AM_CPPFLAGS += $(SDL_CFLAGS) $(GTHREAD_CFLAGS) $(X_CFLAGS) $(ALSA_CFLAGS) $(LIBAGG_CFLAGS) $(LIBSOUNDTOUCH_CFLAGS) -EXTRA_DIST = build.bat instruction_tabdef.inc thumb_tabdef.inc fs-linux.cpp fs-windows.cpp +EXTRA_DIST = build.bat instruction_tabdef.inc thumb_tabdef.inc fs-linux.cpp fs-windows.cpp cocoa if HAVE_GDB_STUB SUBDIRS = . gdbstub $(UI_DIR) else SUBDIRS = . $(UI_DIR) endif -DIST_SUBDIRS = . gdbstub cli cocoa gtk gtk-glade wx +DIST_SUBDIRS = . gdbstub cli gtk gtk-glade wx noinst_LIBRARIES = libdesmume.a libdesmume_a_SOURCES = \ armcpu.cpp armcpu.h \