[gedit] Make win32/ non-recursively

[Jesse van den Kieboom <jessevdk src gnome org>]

commit 180e919fee157f3b0174bb0096389b738d4b951c
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Sun Jan 12 01:30:07 2014 +0100

    Make win32/ non-recursively

 Makefile.am       |    3 ++-
 configure.ac      |    1 -
 win32/Makefile.am |    7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8da330b..2843e68 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
 
-SUBDIRS = libgd gedit po plugins docs tests win32 osx
+SUBDIRS = libgd gedit po plugins docs tests osx
 
 if !OS_OSX
 SUBDIRS += help
@@ -86,6 +86,7 @@ dist_gsettingsschema_DATA =
 
 include data/Makefile.am
 include pixmaps/Makefile.am
+include win32/Makefile.am
 
 EXTRA_DIST += $(gsettings_SCHEMAS:.gschema.xml=.gschema.xml.in)
 CLEANFILES += $(gsettings_SCHEMAS)
diff --git a/configure.ac b/configure.ac
index 911b49b..5b0bef8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -474,7 +474,6 @@ plugins/zeitgeist/Makefile
 po/Makefile.in
 tests/Makefile
 win32/gedit.iss
-win32/Makefile
 osx/Info.plist
 osx/Makefile])
 
diff --git a/win32/Makefile.am b/win32/Makefile.am
index 7006780..08eda77 100644
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -1,4 +1,5 @@
 # Stuff to build the Windows installer:
-EXTRA_DIST = gedit.iss.in build-installer.sh querymodules.bat
-
--include $(top_srcdir)/git.mk
+EXTRA_DIST +=                          \
+       win32/gedit.iss.in              \
+       win32/build-installer.sh        \
+       win32/querymodules.bat