Commit b93b6629 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

2015

Still alive!

(cherry picked from commit d8976582c45911a2ca4125854cd85780721184e9)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 59409d5d
...@@ -106,7 +106,7 @@ AUTOMAKE_OPTIONS = \ ...@@ -106,7 +106,7 @@ AUTOMAKE_OPTIONS = \
ChangeLog: Makefile.am ChangeLog: Makefile.am
rm -f -- "$@" rm -f -- "$@"
cd doc && $(MAKE) $(AM_MAKEFLAGS) changelogs cd doc && $(MAKE) $(AM_MAKEFLAGS) changelogs
$(LN_S) -f doc/ChangeLog-2014 "$@" $(LN_S) -f doc/ChangeLog-2015 "$@"
############################################################################### ###############################################################################
# Mac OS X project # Mac OS X project
......
dnl Autoconf settings for vlc dnl Autoconf settings for vlc
AC_COPYRIGHT([Copyright 2002-2014 VLC authors and VideoLAN]) AC_COPYRIGHT([Copyright 1999-2015 VLC authors and VideoLAN])
AC_INIT(vlc, 2.2.0-rc2) AC_INIT(vlc, 2.2.0-rc2)
VERSION_MAJOR=2 VERSION_MAJOR=2
...@@ -14,7 +14,7 @@ AC_SUBST(PKGDIR) ...@@ -14,7 +14,7 @@ AC_SUBST(PKGDIR)
CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`" CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
CODENAME="Weatherwax" CODENAME="Weatherwax"
COPYRIGHT_YEARS="1996-2014" COPYRIGHT_YEARS="1996-2015"
AC_CONFIG_SRCDIR(src/libvlc.c) AC_CONFIG_SRCDIR(src/libvlc.c)
AC_CONFIG_AUX_DIR(autotools) AC_CONFIG_AUX_DIR(autotools)
......
...@@ -37,6 +37,7 @@ CHANGELOGS = \ ...@@ -37,6 +37,7 @@ CHANGELOGS = \
ChangeLog-2012 \ ChangeLog-2012 \
ChangeLog-2013 \ ChangeLog-2013 \
ChangeLog-2014 \ ChangeLog-2014 \
ChangeLog-2015 \
$(NULL) $(NULL)
man1_MANS = \ man1_MANS = \
...@@ -84,7 +85,7 @@ $(CHANGELOGS): Makefile.am ...@@ -84,7 +85,7 @@ $(CHANGELOGS): Makefile.am
fi fi
# This one needs to be rebuilt all the time :) # This one needs to be rebuilt all the time :)
.PHONY: ChangeLog-2014 changelogs doc .PHONY: ChangeLog-2015 changelogs doc
changelogs: $(CHANGELOGS) changelogs: $(CHANGELOGS)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment