History

Merge commit '11a9320de54759340531177c9f2b1e31e6112cc2'

* commit '11a9320de54759340531177c9f2b1e31e6112cc2': build: Move build-system-related helper files to a separate subdirectory "ffbuild" directory name is used instead of "avbuild".

Clément Bœsch committed 9 years ago

Commit 3f177512 parents c3e0854 11a932019 files · +47 −38Browse files

Unified · Split

19 files
  1. .gitignore +2 −1
  2. Makefile +11 −8
  3. configure +13 −12
  4. doc/Makefile +1 −1
  5. doc/writing_filters.txt +4 −4
  6. ffbuild/.gitignore +4 −0
  7. ffbuild/arch.mak +0 −0
  8. ffbuild/common.mak +1 −1
  9. ffbuild/library.mak +1 −1
  10. ffbuild/version.sh +0 −0
  11. libavcodec/Makefile +1 −1
  12. libavdevice/Makefile +1 −1
  13. libavfilter/Makefile +1 −1
  14. libavformat/Makefile +1 −1
  15. libavutil/Makefile +1 −1
  16. libpostproc/Makefile +1 −1
  17. libswresample/Makefile +1 −1
  18. libswscale/Makefile +1 −1
  19. tests/fate.sh +2 −2
.gitignore+2−1
@@ -27,7 +27,8 @@ · 26 unmodified lines
2727 /ffplay
2828 /ffprobe
2929 /ffserver
30−/config.*
30+/config.asm
31+/config.h
3132 /coverage.info
3233 /avversion.h
3334 /lcov/
Makefile+11−8
@@ -1,5 +1,5 @@
11 MAIN_MAKEFILE=1
2−include config.mak
2+include ffbuild/config.mak
33
44 vpath %.c $(SRC_PATH)
55 vpath %.cpp $(SRC_PATH)
@@ -66,7 +66,7 @@ SKIPHEADERS = cmdutils_common_opts.h \ · 60 unmodified lines
6666 all: all-yes
6767
6868 include $(SRC_PATH)/tools/Makefile
69−include $(SRC_PATH)/common.mak
69+include $(SRC_PATH)/ffbuild/common.mak
7070
7171 FF_EXTRALIBS := $(FFEXTRALIBS)
7272 FF_DEP_LIBS := $(DEP_LIBS)
@@ -91,8 +91,8 @@ CONFIGURABLE_COMPONENTS = \ · 18 unmodified lines
9191 $(SRC_PATH)/libavcodec/bitstream_filters.c \
9292 $(SRC_PATH)/libavformat/protocols.c \
9393
94−config.h: .config
95−.config: $(CONFIGURABLE_COMPONENTS)
94+config.h: ffbuild/.config
95+ffbuild/.config: $(CONFIGURABLE_COMPONENTS)
9696 @-tput bold 2>/dev/null
9797 @-printf '\nWARNING: $(?) newer than config.h, rerun configure\n\n'
9898 @-tput sgr0 2>/dev/null
@@ -115,7 +115,7 @@ SUBDIR := $(1)/ · 16 unmodified lines
115115 include $(SRC_PATH)/$(1)/Makefile
116116 -include $(SRC_PATH)/$(1)/$(ARCH)/Makefile
117117 -include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile
118−include $(SRC_PATH)/library.mak
118+include $(SRC_PATH)/ffbuild/library.mak
119119 endef
120120
121121 $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
@@ -142,10 +142,10 @@ $(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF) · 20 unmodified lines
142142 %$(PROGSSUF)_g$(EXESUF): %.o $(FF_DEP_LIBS)
143143 $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)
144144
145−VERSION_SH = $(SRC_PATH)/version.sh
145+VERSION_SH = $(SRC_PATH)/ffbuild/version.sh
146146 GIT_LOG = $(SRC_PATH)/.git/logs/HEAD
147147
148−.version: $(wildcard $(GIT_LOG)) $(VERSION_SH) config.mak
148+.version: $(wildcard $(GIT_LOG)) $(VERSION_SH) ffbuild/config.mak
149149 .version: M=@
150150
151151 libavutil/ffversion.h .version:
@@ -194,7 +194,10 @@ clean:: · 42 unmodified lines
194194
195195 distclean::
196196 $(RM) $(DISTCLEANSUFFIXES)
197− $(RM) config.* .config libavutil/avconfig.h .version mapfile avversion.h version.h libavutil/ffversion.h libavcodec/codec_names.h libavcodec/bsf_list.c libavformat/protocol_list.c
197+ $(RM) .version avversion.h config.asm config.h mapfile \
198+ ffbuild/.config ffbuild/config.* libavutil/avconfig.h \
199+ version.h libavutil/ffversion.h libavcodec/codec_names.h \
200+ libavcodec/bsf_list.c libavformat/protocol_list.c
198201 ifeq ($(SRC_LINK),src)
199202 $(RM) src
200203 endif
configure+13−12
@@ -77,7 +77,7 @@ Help options: · 76 unmodified lines
7777 --list-filters show all available filters
7878
7979 Standard options:
80− --logfile=FILE log tests and output to FILE [config.log]
80+ --logfile=FILE log tests and output to FILE [ffbuild/config.log]
8181 --disable-logging do not log configure debug information
8282 --fatal-warnings fail if any configure warning is generated
8383 --prefix=PREFIX install in PREFIX [$prefix_default]
@@ -3224,7 +3224,7 @@ doc_deps_any="manpages htmlpages podpages txtpages" · 3140 unmodified lines
32243224
32253225 # default parameters
32263226
3227−logfile="config.log"
3227+logfile="ffbuild/config.log"
32283228
32293229 # installation paths
32303230 prefix_default="/usr/local"
@@ -3581,6 +3581,7 @@ disable_components(){ · 350 unmodified lines
35813581
35823582 map 'disable_components $v' $LIBRARY_LIST
35833583
3584+mkdir -p ffbuild
35843585 echo "# $0 $FFMPEG_CONFIGURATION" > $logfile
35853586 set >> $logfile
35863587
@@ -5152,7 +5153,7 @@ esc(){ · 1565 unmodified lines
51525153 echo "$*" | sed 's/%/%25/g;s/:/%3a/g'
51535154 }
51545155
5155−echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $FFMPEG_CONFIGURATION)" >config.fate
5156+echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $FFMPEG_CONFIGURATION)" > ffbuild/config.fate
51565157
51575158 check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable_weak pic
51585159
@@ -6619,9 +6620,9 @@ test -e Makefile || echo "include $source_path/Makefile" > Makefile · 1460 unmodified lines
66196620
66206621 enabled stripping || strip="echo skipping strip"
66216622
6622−config_files="$TMPH config.mak doc/config.texi"
6623+config_files="$TMPH ffbuild/config.mak doc/config.texi"
66236624
6624−cat > config.mak <<EOF
6625+cat > ffbuild/config.mak <<EOF
66256626 # Automatically generated by configure - do not modify!
66266627 ifndef FFMPEG_CONFIG_MAK
66276628 FFMPEG_CONFIG_MAK=1
@@ -6755,18 +6756,18 @@ get_version(){ · 127 unmodified lines
67556756 eval $(awk "/#define ${name}_VERSION_M/ { print \$2 \"=\" \$3 }" "$file")
67566757 enabled raise_major && eval ${name}_VERSION_MAJOR=$((${name}_VERSION_MAJOR+100))
67576758 eval ${name}_VERSION=\$${name}_VERSION_MAJOR.\$${name}_VERSION_MINOR.\$${name}_VERSION_MICRO
6758− eval echo "${lcname}_VERSION=\$${name}_VERSION" >> config.mak
6759− eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> config.mak
6760− eval echo "${lcname}_VERSION_MINOR=\$${name}_VERSION_MINOR" >> config.mak
6759+ eval echo "${lcname}_VERSION=\$${name}_VERSION" >> ffbuild/config.mak
6760+ eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> ffbuild/config.mak
6761+ eval echo "${lcname}_VERSION_MINOR=\$${name}_VERSION_MINOR" >> ffbuild/config.mak
67616762 }
67626763
67636764 map 'get_version $v' $LIBRARY_LIST
67646765
6765−map 'eval echo "${v}_FFLIBS=\$${v}_deps" >> config.mak' $LIBRARY_LIST
6766+map 'eval echo "${v}_FFLIBS=\$${v}_deps" >> ffbuild/config.mak' $LIBRARY_LIST
67666767
67676768 print_program_extralibs(){
67686769 eval "program_extralibs=\$${1}_extralibs"
6769− eval echo "EXTRALIBS-${1}=${program_extralibs}" >> config.mak
6770+ eval echo "EXTRALIBS-${1}=${program_extralibs}" >> ffbuild/config.mak
67706771 }
67716772
67726773 map 'print_program_extralibs $v' $PROGRAM_LIST
@@ -6816,11 +6817,11 @@ print_config CONFIG_ "$config_files" $CONFIG_LIST \ · 43 unmodified lines
68166817 $ALL_COMPONENTS \
68176818
68186819 echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH
6819−echo "endif # FFMPEG_CONFIG_MAK" >> config.mak
6820+echo "endif # FFMPEG_CONFIG_MAK" >> ffbuild/config.mak
68206821
68216822 # Do not overwrite an unchanged config.h to avoid superfluous rebuilds.
68226823 cp_if_changed $TMPH config.h
6823−touch .config
6824+touch ffbuild/.config
68246825
68256826 enabled yasm && cp_if_changed $TMPASM config.asm
68266827
doc/Makefile+1−1
@@ -128,7 +128,7 @@ $(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples · 127 unmodified lines
128128 OBJDIRS += doc/examples
129129
130130 DOXY_INPUT = $(INSTHEADERS) $(DOC_EXAMPLES:%$(EXESUF)=%.c) $(LIB_EXAMPLES:%$(EXESUF)=%.c)
131−DOXY_INPUT_DEPS = $(addprefix $(SRC_PATH)/, $(DOXY_INPUT)) config.mak
131+DOXY_INPUT_DEPS = $(addprefix $(SRC_PATH)/, $(DOXY_INPUT)) ffbuild/config.mak
132132
133133 doc/doxy/html: TAG = DOXY
134134 doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(SRC_PATH)/doc/doxy-wrapper.sh $(DOXY_INPUT_DEPS)
doc/writing_filters.txt+4−4
@@ -38,14 +38,14 @@ the build system and the C: · 37 unmodified lines
3838
3939 --- after running configure ---
4040
41− $ grep FOOBAR config.mak
41+ $ grep FOOBAR ffbuild/config.mak
4242 CONFIG_FOOBAR_FILTER=yes
4343 $ grep FOOBAR config.h
4444 #define CONFIG_FOOBAR_FILTER 1
4545
46−CONFIG_FOOBAR_FILTER=yes from the config.mak is later used to enable the filter in
47−libavfilter/Makefile and CONFIG_FOOBAR_FILTER=1 from the config.h will be used
48−for registering the filter in libavfilter/allfilters.c.
46+CONFIG_FOOBAR_FILTER=yes from the ffbuild/config.mak is later used to enable
47+the filter in libavfilter/Makefile and CONFIG_FOOBAR_FILTER=1 from the config.h
48+will be used for registering the filter in libavfilter/allfilters.c.
4949
5050 Filter code layout
5151 ==================
ffbuild/.gitignore+4−0
@@ -0,0 +1,4 @@
1+/.config
2+/config.fate
3+/config.log
4+/config.mak
ffbuild/arch.makrenamed from arch.mak+0−0

File renamed without changes.

ffbuild/common.makrenamed from common.mak+1−1
@@ -103,7 +103,7 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC) · 102 unmodified lines
103103 $(OBJS):
104104 endif
105105
106−include $(SRC_PATH)/arch.mak
106+include $(SRC_PATH)/ffbuild/arch.mak
107107
108108 OBJS += $(OBJS-yes)
109109 SLIBOBJS += $(SLIBOBJS-yes)
ffbuild/library.makrenamed from library.mak+1−1
@@ -1,4 +1,4 @@
1−include $(SRC_PATH)/common.mak
1+include $(SRC_PATH)/ffbuild/common.mak
22
33 LIBVERSION := $(lib$(NAME)_VERSION)
44 LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR)
ffbuild/version.shrenamed from version.sh+0−0

File renamed without changes.

libavcodec/Makefile+1−1
@@ -1,4 +1,4 @@
1−include $(SUBDIR)../config.mak
1+include $(SUBDIR)../ffbuild/config.mak
22
33 NAME = avcodec
44
libavdevice/Makefile+1−1
@@ -1,4 +1,4 @@
1−include $(SUBDIR)../config.mak
1+include $(SUBDIR)../ffbuild/config.mak
22
33 NAME = avdevice
44
libavfilter/Makefile+1−1
@@ -1,4 +1,4 @@
1−include $(SUBDIR)../config.mak
1+include $(SUBDIR)../ffbuild/config.mak
22
33 NAME = avfilter
44
libavformat/Makefile+1−1
@@ -1,4 +1,4 @@
1−include $(SUBDIR)../config.mak
1+include $(SUBDIR)../ffbuild/config.mak
22
33 NAME = avformat
44
libavutil/Makefile+1−1
@@ -1,4 +1,4 @@
1−include $(SUBDIR)../config.mak
1+include $(SUBDIR)../ffbuild/config.mak
22
33 NAME = avutil
44
libpostproc/Makefile+1−1
@@ -1,4 +1,4 @@
1−include $(SUBDIR)../config.mak
1+include $(SUBDIR)../ffbuild/config.mak
22
33 NAME = postproc
44 FFLIBS = avutil
libswresample/Makefile+1−1
@@ -1,4 +1,4 @@
1−include $(SUBDIR)../config.mak
1+include $(SUBDIR)../ffbuild/config.mak
22
33 NAME = swresample
44 FFLIBS = avutil
libswscale/Makefile+1−1
@@ -1,4 +1,4 @@
1−include $(SUBDIR)../config.mak
1+include $(SUBDIR)../ffbuild/config.mak
22
33 NAME = swscale
44
tests/fate.sh+2−2
@@ -85,7 +85,7 @@ clean(){ · 84 unmodified lines
8585 report(){
8686 date=$(date -u +%Y%m%d%H%M%S)
8787 echo "fate:1:${date}:${slot}:${version}:$1:$2:${branch}:${comment}" >report
88− cat ${build}/config.fate >>report
88+ cat ${build}/ffbuild/config.fate >>report
8989 cat ${build}/tests/data/fate/*.rep >>report 2>/dev/null || for i in ${build}/tests/data/fate/*.rep ; do cat "$i" >>report 2>/dev/null; done
9090 test -n "$fate_recv" && $tar report *.log | gzip | $fate_recv
9191 }
@@ -108,7 +108,7 @@ test -d "$src" && update || checkout || die "Error fetching source" · 16 unmodified lines
108108
109109 cd ${workdir}
110110
111−version=$(${src}/version.sh ${src})
111+version=$(${src}/ffbuild/version.sh ${src})
112112 test "$version" = "$(cat version-$slot 2>/dev/null)" && exit 0
113113 echo ${version} >version-$slot
114114

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t