[xine-cvs] HG: xine-lib-1.2: Back out macosx build changes: separate units (so far unused).

[<li...@yo...>]

# HG changeset patch
# User Darren Salt <li...@yo...>
# Date 1201825460 0
# Node ID 748be07d36f00c6e8f510ee549e012c87651f46c
# Parent  023f9b2bd1241c8aaba414c0e8c095d9fe5d7eaa
Back out macosx build changes: separate units (so far unused).
Also, built files don't end up in the lib directory.

diff -r 748be07d36f00c6e8f510ee549e012c87651f46c -r 023f9b2bd1241c8aaba414c0e8c095d9fe5d7eaa configure.ac
--- a/configure.ac	Fri Feb 01 00:24:20 2008 +0000
+++ b/configure.ac	Sun Jan 27 16:32:37 2008 +0100
@@ -1199,6 +1199,7 @@ src/video_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 -r 748be07d36f00c6e8f510ee549e012c87651f46c -r 023f9b2bd1241c8aaba414c0e8c095d9fe5d7eaa src/video_out/Makefile.am
--- a/src/video_out/Makefile.am	Fri Feb 01 00:24:20 2008 +0000
+++ b/src/video_out/Makefile.am	Sun Jan 27 16:32:37 2008 +0100
@@ -7,8 +7,7 @@ SUBDIRS =
 SUBDIRS = 
 
 if ENABLE_MACOSX_VIDEO
-xineinclude_HEADERS = macosx/video_window.h macosx/XineOpenGLView.h macosx/XineVideoWindow.h
-lib_LTLIBRARIES = libxineMacOSXVideo.la
+SUBDIRS += macosx
 endif
 
 EXTRA_DIST = video_out_directx.c video_out_macosx.m
@@ -195,8 +194,3 @@ xineplug_vo_out_macosx_la_SOURCES = vide
 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 -r 748be07d36f00c6e8f510ee549e012c87651f46c -r 023f9b2bd1241c8aaba414c0e8c095d9fe5d7eaa src/video_out/macosx/Makefile.am
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/video_out/macosx/Makefile.am	Sun Jan 27 16:32:37 2008 +0100
@@ -0,0 +1,12 @@
+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)