We have version.h files in subdirectories, which can clash if both headers
need to be #included in the same file.
---
.gitignore | 2 +-
Makefile | 6 +++---
cmdutils.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index 7f95c9e..3fe1cdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
.config
.version
-/version.h
*.a
*.o
*.d
@@ -24,6 +23,7 @@ avconv
avplay
avprobe
avserver
+avversion.h
doc/avoptions_codec.texi
doc/avoptions_format.texi
doc/print_options
diff --git a/Makefile b/Makefile
index 52b6647..de73f98 100644
--- a/Makefile
+++ b/Makefile
@@ -137,8 +137,8 @@ GIT_LOG = $(SRC_PATH)/.git/logs/HEAD
.version: $(wildcard $(GIT_LOG)) $(VERSION_SH) config.mak
.version: M=@
-version.h .version:
- $(M)$(VERSION_SH) $(SRC_PATH) version.h $(EXTRA_VERSION)
+avversion.h .version:
+ $(M)$(VERSION_SH) $(SRC_PATH) avversion.h $(EXTRA_VERSION)
$(Q)touch .version
# force version.sh to run whenever version might have changed
@@ -179,7 +179,7 @@ clean::
distclean::
$(RM) $(DISTCLEANSUFFIXES)
- $(RM) config.* .version version.h libavutil/avconfig.h
+ $(RM) avversion.h .version config.* libavutil/avconfig.h
config:
$(SRC_PATH)/configure $(value LIBAV_CONFIGURATION)
diff --git a/cmdutils.c b/cmdutils.c
index 6d13bd6..71f9f10 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -43,8 +43,8 @@
#include "libavutil/eval.h"
#include "libavutil/dict.h"
#include "libavutil/opt.h"
+#include "avversion.h"
#include "cmdutils.h"
-#include "version.h"
#if CONFIG_NETWORK
#include "libavformat/network.h"
#endif
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
