From d2ddb26cccd02063d2904a303194cb6009649d97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sun, 27 Jan 2008 16:21:09 +0100 Subject: Use AM_PROG_CC_C_O as needed by the xine-fontconv program. --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 8c6a8cffe..b40f7ae75 100644 --- a/configure.ac +++ b/configure.ac @@ -156,6 +156,7 @@ dnl checks for programs dnl ------------------- AC_PROG_CC +AM_PROG_CC_C_O AC_GNU_SOURCE AC_ISC_POSIX -- cgit v1.2.3 From 873a841ce7df818c82991dfa2eeafa019043fae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= 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 From 55eb56b71ccdee084e3ef0e1c25118b0d111efa7 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Fri, 1 Feb 2008 00:24:20 +0000 Subject: Back out macosx build changes: separate units (so far unused). Also, built files don't end up in the lib directory. --- configure.ac | 1 + src/video_out/Makefile.am | 8 +------- src/video_out/macosx/Makefile.am | 12 ++++++++++++ 3 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 src/video_out/macosx/Makefile.am diff --git a/configure.ac b/configure.ac index ef55a27ee..b40f7ae75 100644 --- a/configure.ac +++ b/configure.ac @@ -1199,6 +1199,7 @@ 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 b661fdd4b..3b5703792 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -7,8 +7,7 @@ AM_OBJCFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) 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_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 new file mode 100644 index 000000000..ae6a5acc8 --- /dev/null +++ b/src/video_out/macosx/Makefile.am @@ -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) -- cgit v1.2.3