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
9797 libavcodec/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
9898
9999 $(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF)
100+ifeq ($(STRIPTYPE),direct)
101+ $(STRIP) -o $@ $<
102+else
100103 $(CP) $< $@
101104 $(STRIP) $@
105+endif
102106
103107 %$(PROGSSUF)_g$(EXESUF): $(FF_DEP_LIBS)
104108 $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)
configure+4−0
@@ -3363,6 +3363,7 @@ x86asmexe_default="nasm" · 3362 unmodified lines
33633363 windres_default="windres"
33643364 nvcc_default="nvcc"
33653365 nvccflags_default="-gencode arch=compute_30,code=sm_30 -O2"
3366+striptype="direct"
33663367
33673368 # OS
33683369 target_os_default=$(tolower $(uname -s))
@@ -5089,6 +5090,7 @@ case $target_os in · 1720 unmodified lines
50895090 ;;
50905091 os/2*)
50915092 strip="lxlite -CS"
5093+ striptype=""
50925094 objformat="aout"
50935095 add_cppflags -D_GNU_SOURCE
50945096 add_ldflags -Zomf -Zbin-files -Zargs-wild -Zhigh-mem -Zmap
@@ -6834,6 +6836,7 @@ fi # test "$quiet" != "yes" · 1739 unmodified lines
68346836 test -e Makefile || echo "include $source_path/Makefile" > Makefile
68356837
68366838 enabled stripping || strip="echo skipping strip"
6839+enabled stripping || striptype=""
68376840
68386841 config_files="$TMPH ffbuild/config.mak doc/config.texi"
68396842
@@ -6877,6 +6880,7 @@ ARFLAGS=$arflags · 37 unmodified lines
68776880 AR_O=$ar_o
68786881 RANLIB=$ranlib
68796882 STRIP=$strip
6883+STRIPTYPE=$striptype
68806884 NVCC=$nvcc
68816885 CP=cp -p
68826886 LN_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