[gedit/wip/non-recursive-make] Make osx/ non-recursively

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

commit 366b5b8612238a18d35482af5bf71fc4a0a3f7fe
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Sun Jan 12 01:40:02 2014 +0100

    Make osx/ non-recursively

 Makefile.am     |    3 ++-
 configure.ac    |    3 +--
 osx/Makefile.am |    4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 2843e68..bd6c5f6 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 osx
+SUBDIRS = libgd gedit po plugins docs tests
 
 if !OS_OSX
 SUBDIRS += help
@@ -87,6 +87,7 @@ dist_gsettingsschema_DATA =
 include data/Makefile.am
 include pixmaps/Makefile.am
 include win32/Makefile.am
+include osx/Makefile.am
 
 EXTRA_DIST += $(gsettings_SCHEMAS:.gschema.xml=.gschema.xml.in)
 CLEANFILES += $(gsettings_SCHEMAS)
diff --git a/configure.ac b/configure.ac
index 5b0bef8..b256c77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -474,8 +474,7 @@ plugins/zeitgeist/Makefile
 po/Makefile.in
 tests/Makefile
 win32/gedit.iss
-osx/Info.plist
-osx/Makefile])
+osx/Info.plist])
 
 AC_OUTPUT
 
diff --git a/osx/Makefile.am b/osx/Makefile.am
index a22da52..a727ece 100644
--- a/osx/Makefile.am
+++ b/osx/Makefile.am
@@ -1,3 +1 @@
-EXTRA_DIST = Info.plist.in
-
--include $(top_srcdir)/git.mk
+EXTRA_DIST += osx/Info.plist.in