From 7fb9dc915cded39e8ad4bed49a14b0d6769ba5bd Mon Sep 17 00:00:00 2001 From: Stephen Torri Date: Thu, 19 Sep 2002 06:01:18 +0000 Subject: Updated cvscompile.sh to look for configure.ac Replaced configure.in with configure.ac Remove acconfig.h (Unnecessary with autoconf 2.52 or above) Updated configure.ac to remove deprecated macros, upgraded AC_DEFINE to include comments, merged in acconfig.h. Combined libxine and libxineutils into one library. libxineutils is created but not installed. Its statically linked into libxine. Advanced libxine version from 0.2.0 to 1.0.0 Removed references for skins. Plugins now installed to /xine/plugins/$XINE_MAJOR.$XINE_MORE. $XINE_SUB Xine-config updated for new location of plugins Sorted file lists in Makefile.am to make them more readable. TODO: remove skins references from xine-config CVS patchset: 2705 CVS date: 2002/09/19 06:01:18 --- doc/Makefile.am | 22 +++++++++++----------- doc/hackersguide/Makefile.am | 3 --- doc/man/en/man3/Makefile.am | 42 +++++++++++++++++++++++++++++++++++------- doc/man/en/man3/xine.h.3 | 7 +------ 4 files changed, 47 insertions(+), 27 deletions(-) (limited to 'doc') diff --git a/doc/Makefile.am b/doc/Makefile.am index c4136e52f..c5c983c9b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -9,22 +9,22 @@ docs_DOCS = install-data-local: @documentations='$(docs_DOCS)'; \ for doc in $$documentations; do \ - destdir=$(DESTDIR)$(docdir); \ - name=`echo $$doc` \ - dir=$$destdir; \ - $(mkinstalldirs) $$dir; \ - $(INSTALL_DATA) $$doc $$dir/$$name; \ - echo "installing $$doc as $$dir/$$name"; \ + destdir=$(DESTDIR)$(docdir); \ + name=`echo $$doc` \ + dir=$$destdir; \ + $(mkinstalldirs) $$dir; \ + $(INSTALL_DATA) $$doc $$dir/$$name; \ + echo "installing $$doc as $$dir/$$name"; \ done uninstall-local: @documentations='$(docs_DOCS)'; \ for doc in $$documentations; do \ - destdir=$(DESTDIR)$(docdir); \ - name=`echo $$doc` \ - dir=$$destdir; \ - rm -f $$dir/$$name; \ - echo "removing $$dir/$$name" ; \ + destdir=$(DESTDIR)$(docdir); \ + name=`echo $$doc` \ + dir=$$destdir; \ + rm -f $$dir/$$name; \ + echo "removing $$dir/$$name" ; \ done debug: diff --git a/doc/hackersguide/Makefile.am b/doc/hackersguide/Makefile.am index a02274a88..13eacd7ff 100644 --- a/doc/hackersguide/Makefile.am +++ b/doc/hackersguide/Makefile.am @@ -3,9 +3,6 @@ EXTRA_DIST = README intro.sgml hackersguide.sgml architecture.fig docdir = $(prefix)/share/doc/xine/hackersguide - - - mostlyclean-generic: -rm -f *~ \#* .*~ .\#* diff --git a/doc/man/en/man3/Makefile.am b/doc/man/en/man3/Makefile.am index 9be0381ea..015314a2a 100644 --- a/doc/man/en/man3/Makefile.am +++ b/doc/man/en/man3/Makefile.am @@ -1,11 +1,39 @@ man_MANS = \ - ao_driver_t.3 build_info.3 loadplugins_group.3 video_group.3 vo_overlay_t.3 \ - ao_functions_t.3 cfg_data_t.3 mrl_t.3 video_prop.3 xine.h.3 \ - audio_cap.3 config_group.3 mrl_types.3 video_ratio.3 xine_api.3 \ - audio_group.3 config_values_s.3 status_group.3 visual_types.3 xine_init.3 \ - audio_prop.3 config_values_t.3 ui_callbacks.3 vo_driver_s.3 xine_management.3 \ - autoplay_group.3 demux_strategy.3 version_group.3 vo_driver_t.3 xine_t.3 \ - browse_group.3 event_group.3 video_cap.3 vo_frame_t.3 xine_version.3 + ao_driver_t.3 \ + ao_functions_t.3 \ + audio_cap.3 \ + audio_group.3 \ + audio_prop.3 \ + autoplay_group.3 \ + browse_group.3 \ + build_info.3 \ + cfg_data_t.3 \ + config_group.3 \ + config_values_s.3 \ + config_values_t.3 \ + demux_strategy.3 \ + event_group.3 \ + loadplugins_group.3 \ + mrl_t.3 \ + mrl_types.3 \ + status_group.3 \ + ui_callbacks.3 \ + version_group.3 \ + video_cap.3 \ + video_group.3 \ + video_prop.3 \ + video_ratio.3 \ + visual_types.3 \ + vo_driver_s.3 \ + vo_driver_t.3 \ + vo_frame_t.3 \ + vo_overlay_t.3 \ + xine.h.3 \ + xine_api.3 \ + xine_init.3 \ + xine_management.3 \ + xine_t.3 \ + xine_version.3 EXTRA_DIST = $(man_MANS) diff --git a/doc/man/en/man3/xine.h.3 b/doc/man/en/man3/xine.h.3 index 8ccf4642a..346708584 100644 --- a/doc/man/en/man3/xine.h.3 +++ b/doc/man/en/man3/xine.h.3 @@ -23,9 +23,6 @@ xine.h \- .in +1c .ti -1c -.RI "#define \fBXINE_SKINDIR\fP '/usr/local/share/xine/skins'" -.br -.ti -1c .RI "#define \fBXINE_BUILD_CC\fP 'gcc version 2.95.3 20010315 (release)'" .br .ti -1c @@ -515,9 +512,7 @@ API of XINE library. .PP .SH "DEFINE DOCUMENTATION" .PP -.SS "#define XINE_SKINDIR '/usr/local/share/xine/skins'" -.PP Skin file location .SH "AUTHOR" .PP -Generated automatically by Doxygen for XINE, A Free Video Player Project - API reference from the source code. \ No newline at end of file +Generated automatically by Doxygen for XINE, A Free Video Player Project - API reference from the source code. -- cgit v1.2.3