From 873a841ce7df818c82991dfa2eeafa019043fae4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Sun, 27 Jan 2008 16:32:37 +0100
Subject: Move macosx video output library building inside src/video_out, avoid
 one recursive make call.

---
 configure.ac                     |  1 -
 src/video_out/Makefile.am        |  8 +++++++-
 src/video_out/macosx/Makefile.am | 12 ------------
 3 files changed, 7 insertions(+), 14 deletions(-)
 delete mode 100644 src/video_out/macosx/Makefile.am

diff --git a/configure.ac b/configure.ac
index b40f7ae75..ef55a27ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1199,7 +1199,6 @@ src/spu_dec/Makefile
 src/video_dec/Makefile
 src/video_dec/libmpeg2/Makefile
 src/video_out/Makefile
-src/video_out/macosx/Makefile
 src/xine-utils/Makefile
 src/xine-engine/Makefile
 src/vdr/Makefile
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 3b5703792..b661fdd4b 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -7,7 +7,8 @@ AM_OBJCFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 SUBDIRS = 
 
 if ENABLE_MACOSX_VIDEO
-SUBDIRS += macosx
+xineinclude_HEADERS = macosx/video_window.h macosx/XineOpenGLView.h macosx/XineVideoWindow.h
+lib_LTLIBRARIES = libxineMacOSXVideo.la
 endif
 
 EXTRA_DIST = video_out_directx.c video_out_macosx.m
@@ -194,3 +195,8 @@ xineplug_vo_out_none_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL)
 xineplug_vo_out_macosx_la_SOURCES = video_out_macosx.m
 xineplug_vo_out_macosx_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
 xineplug_vo_out_macosx_la_LDFLAGS = $(AM_LDFLAGS) -framework Cocoa -framework OpenGL
+
+libxineMacOSXVideo_la_SOURCES = macosx/XineOpenGLView.m macosx/XineVideoWindow.m
+libxineMacOSXVideo_la_LDFLAGS = $(AM_LDFLAGS) -framework Cocoa	\
+                                -framework OpenGL -version-info	\
+                                $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE)
diff --git a/src/video_out/macosx/Makefile.am b/src/video_out/macosx/Makefile.am
deleted file mode 100644
index ae6a5acc8..000000000
--- a/src/video_out/macosx/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-include $(top_srcdir)/misc/Makefile.common
-
-AM_CFLAGS    = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
-AM_OBJCFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
-
-xineinclude_HEADERS = video_window.h XineOpenGLView.h XineVideoWindow.h
-
-lib_LTLIBRARIES = libxineMacOSXVideo.la
-
-libxineMacOSXVideo_la_SOURCES = XineOpenGLView.m XineVideoWindow.m
-libxineMacOSXVideo_la_LDFLAGS = $(AM_LDFLAGS) -framework Cocoa -framework OpenGL \
-				-version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE)
-- 
cgit v1.2.3