summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/input/Makefile.am31
-rw-r--r--src/input/libreal/Makefile.am10
-rw-r--r--src/input/librtsp/Makefile.am10
-rw-r--r--src/input/vcd/Makefile.am13
-rw-r--r--src/video_out/Makefile.am8
-rw-r--r--src/video_out/macosx/Makefile.am12
6 files changed, 55 insertions, 29 deletions
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index 74aca7240..ca7e6dabd 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -10,23 +10,24 @@ AM_LDFLAGS = $(xineplug_ldflags)
# All of xine input plugins should be named like the scheme "xineplug_inp_"
#
+SUBDIRS = libreal librtsp
+if ENABLE_VCD
+SUBDIRS += vcd
+endif
if !WITH_EXTERNAL_DVDNAV
-SUBDIRS = libdvdnav
+SUBDIRS += libdvdnav
endif
noinst_HEADERS = net_buf_ctrl.h mms.h mmsh.h pnm.h media_helper.h http_helper.h
+
if ENABLE_DVB
in_dvb = xineplug_inp_dvb.la
endif
-if ENABLE_VCD
-in_vcd = xineplug_inp_vcd.la
-endif
-
if ENABLE_VCDO
-in_vcdo = xineplug_inp_vcdo.la
+in_vcd = xineplug_inp_vcdo.la
endif
if ENABLE_V4L
@@ -61,7 +62,6 @@ xineplug_LTLIBRARIES = \
xineplug_inp_http.la \
xineplug_inp_dvd.la \
$(in_vcd) \
- $(in_vcdo) \
$(in_v4l) \
$(in_gnome_vfs) \
$(in_smb) \
@@ -92,12 +92,6 @@ xineplug_inp_mms_la_LIBADD = $(XINE_LIB) $(LTLIBICONV) $(PTHREAD_LIBS) $(LTLIBIN
xineplug_inp_vcdo_la_SOURCES = input_vcd.c media_helper.c
xineplug_inp_vcdo_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
-xineplug_inp_vcd_la_SOURCES = vcd/xineplug_inp_vcd.c vcd/vcdplayer.c \
- vcd/vcdio.c vcd/xine-extra.c vcd/vcdio.h \
- vcd/vcdplayer.h vcd/xine-extra.h
-xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(LIBCDIO_LIBS) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) $(LIBISO9660_LIBS) -lm
-xineplug_inp_vcd_la_CFLAGS = $(AM_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS)
-
xineplug_inp_stdin_fifo_la_SOURCES = input_stdin_fifo.c net_buf_ctrl.c
xineplug_inp_stdin_fifo_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL)
@@ -115,15 +109,8 @@ xineplug_inp_dvb_la_DEPS = $(XDG_BASEDIR_DEPS)
xineplug_inp_dvb_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(XDG_BASEDIR_LIBS)
xineplug_inp_dvb_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS)
-xineplug_inp_rtsp_la_SOURCES = input_rtsp.c net_buf_ctrl.c \
- librtsp/rtsp.c librtsp/rtsp_session.c \
- librtsp/rtsp.h librtsp/rtsp_session.h \
- libreal/real.c libreal/asmrp.c \
- libreal/rmff.c libreal/sdpplin.c \
- libreal/real.h libreal/asmrp.h \
- libreal/rmff.h libreal/sdpplin.h
-xineplug_inp_rtsp_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/libreal -I$(srcdir)/librtsp
-xineplug_inp_rtsp_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL)
+xineplug_inp_rtsp_la_SOURCES = input_rtsp.c net_buf_ctrl.c
+xineplug_inp_rtsp_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) libreal/libreal.la librtsp/librtsp.la
xineplug_inp_cdda_la_SOURCES = input_cdda.c media_helper.c sha1.c sha1.h
xineplug_inp_cdda_la_DEPS = $(XDG_BASEDIR_DEPS)
diff --git a/src/input/libreal/Makefile.am b/src/input/libreal/Makefile.am
new file mode 100644
index 000000000..bd97a7548
--- /dev/null
+++ b/src/input/libreal/Makefile.am
@@ -0,0 +1,10 @@
+include $(top_srcdir)/misc/Makefile.common
+
+AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_CPPFLAGS = -I$(top_srcdir)/src/input/librtsp
+
+noinst_HEADERS = real.h asmrp.h rmff.h sdpplin.h
+
+noinst_LTLIBRARIES = libreal.la
+
+libreal_la_SOURCES = real.c asmrp.c rmff.c sdpplin.c
diff --git a/src/input/librtsp/Makefile.am b/src/input/librtsp/Makefile.am
new file mode 100644
index 000000000..68d554c2c
--- /dev/null
+++ b/src/input/librtsp/Makefile.am
@@ -0,0 +1,10 @@
+include $(top_srcdir)/misc/Makefile.common
+
+AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_CPPFLAGS = -I$(top_srcdir)/src/input/libreal
+
+noinst_HEADERS = rtsp.h rtsp_session.h
+
+noinst_LTLIBRARIES = librtsp.la
+
+librtsp_la_SOURCES = rtsp.c rtsp_session.c
diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am
new file mode 100644
index 000000000..2b47415fd
--- /dev/null
+++ b/src/input/vcd/Makefile.am
@@ -0,0 +1,13 @@
+include $(top_srcdir)/misc/Makefile.common
+
+AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_LDFLAGS = $(xineplug_ldflags)
+
+noinst_HEADERS = vcdio.h vcdplayer.h xine-extra.h
+
+xineplug_LTLIBRARIES = xineplug_inp_vcd.la
+
+xineplug_inp_vcd_la_SOURCES = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c
+xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(LIBCDIO_LIBS) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) $(LIBISO9660_LIBS) -lm
+xineplug_inp_vcd_la_DEPENDENCIES = $(LIBCDIO_DEPS) $(LIBVCD_DEPS) $(LIBVCDINFO_DEPS) $(LIBISO9660_DEPS)
+xineplug_inp_vcd_la_CFLAGS = $(AM_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS)
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)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-05 11:48:15 +0000