diff options
| -rw-r--r-- | .cvsversion | 1 | ||||
| -rw-r--r-- | configure.in | 60 | ||||
| -rw-r--r-- | src/xine-engine/Makefile.am | 3 | ||||
| -rw-r--r-- | src/xine-utils/Makefile.am | 4 |
4 files changed, 34 insertions, 34 deletions
diff --git a/.cvsversion b/.cvsversion new file mode 100644 index 000000000..440670fc3 --- /dev/null +++ b/.cvsversion @@ -0,0 +1 @@ +(remove this file for releases _only_) diff --git a/configure.in b/configure.in index 49ca8efcf..c378b3c05 100644 --- a/configure.in +++ b/configure.in @@ -16,19 +16,38 @@ dnl AC_PREREQ_LIBTOOL(1.4.0,,AC_MSG_ERROR(*** You should have libtool >= 1.4 ins dnl Making releases: -dnl XINE_SUB += 1; -dnl XINE_IFACE_AGE += 1; -dnl XINE_BIN_AGE += 1; -dnl if any functions have been added, set XINE_IFACE_AGE to 0. -dnl if backwards compatibility has been broken, -dnl set XINE_BIN_AGE _and_ XINE_IFACE_AGE to 0. +dnl XINE_SUB += 1; continue with LT_* values below dnl XINE_MAJOR=0 XINE_MINOR=9 XINE_SUB=10 -XINE_PRE="cvs" -XINE_IFACE_AGE=0 -XINE_BIN_AGE=0 + + +dnl The libtool version numbers (LT_*); Don't even think about faking this! +dnl +dnl immediately before every release do: +dnl =================================== +dnl if (the interface is totally unchanged from previous release) +dnl LT_REVISION ++; +dnl else { /* interfaces have been added, removed or changed */ +dnl LT_REVISION = 0; +dnl LT_CURRENT ++; +dnl if (any interfaces have been _added_ since last release) +dnl AGE ++; +dnl if (any interfaces have been _removed_ or incompatibly changed) +dnl AGE = 0; +dnl } + +LT_CURRENT=0 +LT_REVISION=0 +LT_AGE=0 + +dnl for a release tarball do "rm .cvsversion" before "make dist" +if test -f .cvsversion; then + XINE_PRE="cvs" +else + XINE_PRE="" +fi AC_SUBST(XINE_MAJOR) AC_SUBST(XINE_MINOR) @@ -40,25 +59,6 @@ AC_DEFINE_UNQUOTED(XINE_MAJOR, $XINE_MAJOR) AC_DEFINE_UNQUOTED(XINE_MINOR, $XINE_MINOR) AC_DEFINE_UNQUOTED(XINE_SUB, $XINE_SUB) -dnl this is only for pre-1.0 releases (ie with unstable interface) -LT_RELEASE=$XINE_MAJOR.$XINE_MINOR.$XINE_SUB -LT_CURRENT=0 -LT_REVISION=0 -LT_AGE=0 - -dnl non-devel releases should not use LT_RELEASE but something like this: -dnl -dnl LT_REVISION=$XINE_SUB -dnl LT_CURRENT=`expr $XINE_MAJOR + $XINE_MINOR` -dnl LT_AGE=$XINE_MINOR -dnl -dnl !! This only works if subminor releases don't have any interface changes, -dnl !! minor releases _only add_ interfaces and major releases remove at least -dnl !! one interface -dnl otherwise, the LT_* variables must be set according to -dnl <info:(libtool)Updating version info> - -AC_SUBST(LT_RELEASE) AC_SUBST(LT_CURRENT) AC_SUBST(LT_REVISION) AC_SUBST(LT_AGE) @@ -1050,8 +1050,8 @@ echo " * decoder plugins:" echo " - a52 - dts" echo " - mpeg2 - spu" echo " - ffmpeg - mad" -echo " - divx4 - cinepak" -echo " - msvc - cyuv" +echo " - cyuv - divx4" +echo " - cinepak - msvc" if test x"$no_oggvorbis" = "xno"; then echo " - vorbis" fi diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index c263140b9..49744095e 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -15,8 +15,7 @@ libxine_la_DEPENDENCIES = @INTLLIBS@ libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS) -lm libxine_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) include_HEADERS = buffer.h metronom.h configfile.h \ audio_out.h resample.h video_out.h xine_internal.h spu_decoder.h \ diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am index 72ef80ad4..333e21e13 100644 --- a/src/xine-utils/Makefile.am +++ b/src/xine-utils/Makefile.am @@ -7,8 +7,8 @@ lib_LTLIBRARIES = libxineutils.la libxineutils_la_SOURCES = utils.c memcpy.c monitor.c cpu_accel.c xine_mutex.c xmllexer.c xmlparser.c libxineutils_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + include_HEADERS = xineutils.h attributes.h compat.h xmllexer.h xmlparser.h |