diff options
| author | wm4 <wm4@nowhere> | 2012-09-01 21:32:03 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-09-18 21:04:47 +0200 |
| commit | 5a13f5a5e8dd63c899581db86c51c9bb093fcdde (patch) | |
| tree | c2e5259d739d4e1e43223b885326b869bf8e8c1f | |
| parent | e47b779bfc7e3a92a6c483f76ae642f86ca30fba (diff) | |
| download | mpv-5a13f5a5e8dd63c899581db86c51c9bb093fcdde.tar.bz2 mpv-5a13f5a5e8dd63c899581db86c51c9bb093fcdde.tar.xz | |
build: move mpcommon.c to version.c
mpcommon.c used to be the only file to include version.h. version.h is
generated by the build system, and contains the git revision. Any time
a commit is made (or the tree is rebased etc.), the file is rewritten,
and mpcommon.c rebuilt. To make rebuilding less annoying, the definition
of the version string is the only thing in mpcommon.c.
Since I want to add other things to mpcommon.c, add a new file named
version.c, that takes over mpcommon.c's role as described above.
mpcommon.c doesn't include version.h anymore, and will be used to park
code that doesn't really belong anywhere else.
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | mpcommon.c | 4 | ||||
| -rw-r--r-- | version.c | 21 |
3 files changed, 23 insertions, 5 deletions
@@ -106,6 +106,7 @@ SRCS_COMMON = asxparser.c \ m_struct.c \ mp_msg.c \ mpcommon.c \ + version.c \ parser-cfg.c \ path.c \ playlist.c \ @@ -446,7 +447,7 @@ checkheaders: $(ALLHEADERS:.h=.ho) ###### dependency declarations / specific CFLAGS ###### -mpcommon.o osdep/mplayer-rc.o: version.h +version.c osdep/mplayer-rc.o: version.h # Files that depend on libavcodec internals libmpcodecs/vf_fspp.o libmpcodecs/vf_mcdeint.o libmpcodecs/vf_spp.o: CFLAGS := -I$(FFMPEG_SOURCE_PATH) $(CFLAGS) diff --git a/mpcommon.c b/mpcommon.c index e3e6c4ac81..b6e618742e 100644 --- a/mpcommon.c +++ b/mpcommon.c @@ -15,7 +15,3 @@ * with MPlayer; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -#include "version.h" - -const char *mplayer_version = "mplayer " VERSION; diff --git a/version.c b/version.c new file mode 100644 index 0000000000..e3e6c4ac81 --- /dev/null +++ b/version.c @@ -0,0 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "version.h" + +const char *mplayer_version = "mplayer " VERSION; |