History

Makefile: generate stripped CLI tools directly instead of copying unstripped ones first

Now works with --disable-stripping.

Marton Balint committed 9 years ago

Commit ff6de6b1 parent 17ba9e12 files · +8 −0Browse files

Unified · Split

2 files
  1. Makefile +4 −0
  2. configure +4 −0
Makefile+4−0
@@ -97,8 +97,12 @@ include $(SRC_PATH)/doc/examples/Makefile · 96 unmodified lines
97libavcodec/utils.o libavformat/utils.o libavdevice/avdevice.o libavfilter/avfilter.o libavutil/utils.o libpostproc/postprocess.o libswresample/swresample.o libswscale/utils.o : libavutil/ffversion.h97libavcodec/utils.o libavformat/utils.o libavdevice/avdevice.o libavfilter/avfilter.o libavutil/utils.o libpostproc/postprocess.o libswresample/swresample.o libswscale/utils.o : libavutil/ffversion.h
98 98
99$(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF)99$(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF)
100ifeq ($(STRIPTYPE),direct)
101 $(STRIP) -o $@ $<
102else
100 $(CP) $< $@103 $(CP) $< $@
101 $(STRIP) $@104 $(STRIP) $@
105endif
102 106
103%$(PROGSSUF)_g$(EXESUF): $(FF_DEP_LIBS)107%$(PROGSSUF)_g$(EXESUF): $(FF_DEP_LIBS)
104 $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)108 $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)
configure+4−0
@@ -3363,6 +3363,7 @@ x86asmexe_default="nasm" · 3362 unmodified lines
3363windres_default="windres"3363windres_default="windres"
3364nvcc_default="nvcc"3364nvcc_default="nvcc"
3365nvccflags_default="-gencode arch=compute_30,code=sm_30 -O2"3365nvccflags_default="-gencode arch=compute_30,code=sm_30 -O2"
3366striptype="direct"
3366 3367
3367# OS3368# OS
3368target_os_default=$(tolower $(uname -s))3369target_os_default=$(tolower $(uname -s))
@@ -5089,6 +5090,7 @@ case $target_os in · 1720 unmodified lines
5089 ;;5090 ;;
5090 os/2*)5091 os/2*)
5091 strip="lxlite -CS"5092 strip="lxlite -CS"
5093 striptype=""
5092 objformat="aout"5094 objformat="aout"
5093 add_cppflags -D_GNU_SOURCE5095 add_cppflags -D_GNU_SOURCE
5094 add_ldflags -Zomf -Zbin-files -Zargs-wild -Zhigh-mem -Zmap5096 add_ldflags -Zomf -Zbin-files -Zargs-wild -Zhigh-mem -Zmap
@@ -6834,6 +6836,7 @@ fi # test "$quiet" != "yes" · 1739 unmodified lines
6834test -e Makefile || echo "include $source_path/Makefile" > Makefile6836test -e Makefile || echo "include $source_path/Makefile" > Makefile
6835 6837
6836enabled stripping || strip="echo skipping strip"6838enabled stripping || strip="echo skipping strip"
6839enabled stripping || striptype=""
6837 6840
6838config_files="$TMPH ffbuild/config.mak doc/config.texi"6841config_files="$TMPH ffbuild/config.mak doc/config.texi"
6839 6842
@@ -6877,6 +6880,7 @@ ARFLAGS=$arflags · 37 unmodified lines
6877AR_O=$ar_o6880AR_O=$ar_o
6878RANLIB=$ranlib6881RANLIB=$ranlib
6879STRIP=$strip6882STRIP=$strip
6883STRIPTYPE=$striptype
6880NVCC=$nvcc6884NVCC=$nvcc
6881CP=cp -p6885CP=cp -p
6882LN_S=$ln_s6886LN_S=$ln_s

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