diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-27 16:17:47 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-27 16:17:47 +0100 |
| commit | 9c881836d4dead995213b4863e055d32e7372a74 (patch) | |
| tree | f6a494d40ad2f1a41cfb11af6a40e6f4ff315766 /src | |
| parent | b5f4ef58160be1126dd5226f89fd704b24006760 (diff) | |
| download | xine-lib-9c881836d4dead995213b4863e055d32e7372a74.tar.gz xine-lib-9c881836d4dead995213b4863e055d32e7372a74.tar.bz2 | |
Compile librtsp and libreal source files directly into the rtsp plugin. Avoid two recursive make calls.
Diffstat (limited to 'src')
| -rw-r--r-- | src/input/Makefile.am | 14 | ||||
| -rw-r--r-- | src/input/libreal/Makefile.am | 10 | ||||
| -rw-r--r-- | src/input/librtsp/Makefile.am | 10 |
3 files changed, 10 insertions, 24 deletions
diff --git a/src/input/Makefile.am b/src/input/Makefile.am index 64ba0ce54..74aca7240 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -10,9 +10,8 @@ AM_LDFLAGS = $(xineplug_ldflags) # All of xine input plugins should be named like the scheme "xineplug_inp_" # -SUBDIRS = libreal librtsp if !WITH_EXTERNAL_DVDNAV -SUBDIRS += libdvdnav +SUBDIRS = libdvdnav endif @@ -116,8 +115,15 @@ 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 -xineplug_inp_rtsp_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) libreal/libreal.la librtsp/librtsp.la +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_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 deleted file mode 100644 index bd97a7548..000000000 --- a/src/input/libreal/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index 68d554c2c..000000000 --- a/src/input/librtsp/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -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 |