From d9b7ae92b86eed01755d8b484f477cf18502b4ee Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Thu, 6 Oct 2011 12:36:28 +0000
Subject: [PATCH] Fix missing tagmanager/mio/makefile.win32 in EXTRA_DIST.
 Include makefile.win32 in EXTRA_DIST recursively, not at top-level.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@6013 ea778897-0a13-0410-b9d1-a72fbfd435f5
---
 ChangeLog                  | 4 ++++
 Makefile.am                | 5 +----
 scintilla/Makefile.am      | 3 ++-
 src/Makefile.am            | 3 ++-
 tagmanager/Makefile.am     | 3 ++-
 tagmanager/mio/Makefile.am | 3 ++-
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 55e2fc1ff..e3e297d3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
  * doc/Makefile.am, doc/makefile.win32:
    Add doc/makefile.win32 for docs generation.
+ * scintilla/Makefile.am, src/Makefile.am, 
+   tagmanager/mio/Makefile.am, tagmanager/Makefile.am, Makefile.am:
+   Fix missing tagmanager/mio/makefile.win32 in EXTRA_DIST.
+   Include makefile.win32 in EXTRA_DIST recursively, not at top-level.
 
 
 2011-10-06  Colomban Wendling  <colomban(at)geany(dot)org>
diff --git a/Makefile.am b/Makefile.am
index 59a6a102b..2253ed235 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,10 +9,7 @@ ACLOCAL_AMFLAGS = -I m4
 WIN32_BUILD_FILES = \
 	geany_private.rc \
 	win32-config.h \
-	makefile.win32 \
-	scintilla/makefile.win32 \
-	tagmanager/makefile.win32 \
-	src/makefile.win32
+	makefile.win32
 
 SYS_DATA_FILES = \
 	data/c99.tags \
diff --git a/scintilla/Makefile.am b/scintilla/Makefile.am
index 37002762f..2ab1eba7d 100644
--- a/scintilla/Makefile.am
+++ b/scintilla/Makefile.am
@@ -126,4 +126,5 @@ marshallers: gtk/scintilla-marshal.list
 	glib-genmarshal --prefix scintilla_marshal gtk/scintilla-marshal.list --header > gtk/scintilla-marshal.h
 	glib-genmarshal --prefix scintilla_marshal gtk/scintilla-marshal.list --body > gtk/scintilla-marshal.c
 
-EXTRA_DIST=gtk/scintilla-marshal.list License.txt README version.txt
+EXTRA_DIST=gtk/scintilla-marshal.list License.txt README version.txt \
+	makefile.win32
diff --git a/src/Makefile.am b/src/Makefile.am
index 36be874f8..ae52b7e56 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,8 @@
 
 
 EXTRA_DIST = images.c gb.c win32.c win32.h plugindata.h \
-	documentprivate.h filetypesprivate.h pluginprivate.h projectprivate.h
+	documentprivate.h filetypesprivate.h pluginprivate.h projectprivate.h \
+	makefile.win32
 
 bin_PROGRAMS = geany
 
diff --git a/tagmanager/Makefile.am b/tagmanager/Makefile.am
index 754412ce7..175c79f7c 100644
--- a/tagmanager/Makefile.am
+++ b/tagmanager/Makefile.am
@@ -7,7 +7,8 @@ INCLUDES = -I$(srcdir)/include $(GTK_CFLAGS) -I$(srcdir)/mio -I$(srcdir)
 AM_CFLAGS = -DG_LOG_DOMAIN=\""Tagmanager"\"
 
 # regex.c is the GNU regex implementation needed for Windows
-EXTRA_DIST = regex.c
+EXTRA_DIST = regex.c \
+	makefile.win32
 
 noinst_LIBRARIES = libtagmanager.a
 
diff --git a/tagmanager/mio/Makefile.am b/tagmanager/mio/Makefile.am
index 575712e46..89c88d1fb 100644
--- a/tagmanager/mio/Makefile.am
+++ b/tagmanager/mio/Makefile.am
@@ -10,4 +10,5 @@ libmio_a_SOURCES = mio.c
 EXTRA_DIST = \
 	mio.h \
 	mio-file.c \
-	mio-memory.c
+	mio-memory.c \
+	makefile.win32
-- 
2.11.4.GIT