diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-24 13:47:01 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-24 13:47:01 +0000 |
| commit | d3f318eec71d38ce34f590daef0fed1f6cbf2eae (patch) | |
| tree | 0d9e5b6b1e1832e206a229d2da3f24a39af2d8e5 /src/input/Makefile.am | |
| parent | 2f9b558e6ff6f599e4e6ef3422f48b17c44f178b (diff) | |
| parent | 7598a6152ba55ef0ff8dda7f1b7729d2bb22a594 (diff) | |
| download | xine-lib-d3f318eec71d38ce34f590daef0fed1f6cbf2eae.tar.gz xine-lib-d3f318eec71d38ce34f590daef0fed1f6cbf2eae.tar.bz2 | |
Merge from -plugin-loader branch.
base64.{c,h} functions are given "xine_" prefixes and are exported.
--HG--
rename : src/xine-utils/base64.h => include/xine/base64.h
rename : src/xine-engine/configfile.h => include/xine/configfile.h
rename : src/xine-engine/plugin_catalog.h => include/xine/plugin_catalog.h
rename : src/xine-utils/xineutils.h => include/xine/xineutils.h
rename : src/input/base64.c => src/xine-utils/base64.c
Diffstat (limited to 'src/input/Makefile.am')
| -rw-r--r-- | src/input/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/input/Makefile.am b/src/input/Makefile.am index 37ba30a0e..ca7e6dabd 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -112,7 +112,7 @@ 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_cdda_la_SOURCES = input_cdda.c media_helper.c sha1.c sha1.h base64.c base64.h +xineplug_inp_cdda_la_SOURCES = input_cdda.c media_helper.c sha1.c sha1.h xineplug_inp_cdda_la_DEPS = $(XDG_BASEDIR_DEPS) xineplug_inp_cdda_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(XDG_BASEDIR_LIBS) xineplug_inp_cdda_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS) |