aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-10-08 22:16:14 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-10-08 22:16:14 +0000
commite9fd69c8e8d70f2a7c2f367a4704cb60a8df6800 (patch)
tree9b6b95ec7e7e221273bb287e22be6d975cb25b25
parentd419a9f83059f0807b82cdbc7be8e3e8f343707e (diff)
downloadbusybox-w32-e9fd69c8e8d70f2a7c2f367a4704cb60a8df6800.tar.gz
busybox-w32-e9fd69c8e8d70f2a7c2f367a4704cb60a8df6800.tar.bz2
busybox-w32-e9fd69c8e8d70f2a7c2f367a4704cb60a8df6800.zip
make "individual applets" build less noisy.
add *.tmp to list of files deleted by make mrproper.
-rw-r--r--Makefile2
-rwxr-xr-xscripts/trylink6
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 5cc4ab291..6808e7d0f 100644
--- a/Makefile
+++ b/Makefile
@@ -970,7 +970,7 @@ distclean: mrproper
970 @find $(srctree) $(RCS_FIND_IGNORE) \ 970 @find $(srctree) $(RCS_FIND_IGNORE) \
971 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \ 971 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
972 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ 972 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
973 -o -name '.*.rej' -o -size 0 \ 973 -o -name '.*.rej' -o -name '*.tmp' -o -size 0 \
974 -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \ 974 -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
975 -type f -print | xargs rm -f 975 -type f -print | xargs rm -f
976 976
diff --git a/scripts/trylink b/scripts/trylink
index d6538f12e..6905f8626 100755
--- a/scripts/trylink
+++ b/scripts/trylink
@@ -151,10 +151,11 @@ if test "$CONFIG_FEATURE_SHARED_BUSYBOX" = y; then
151fi 151fi
152 152
153if test "$CONFIG_FEATURE_INDIVIDUAL" = y; then 153if test "$CONFIG_FEATURE_INDIVIDUAL" = y; then
154 echo "Linking individual applets against libbusybox (see $sharedlib_dir/*)"
154 gcc -DNAME_MAIN_CNAME -E -include include/autoconf.h include/applets.h \ 155 gcc -DNAME_MAIN_CNAME -E -include include/autoconf.h include/applets.h \
155 | grep -v "^#" \ 156 | grep -v "^#" \
156 | grep -v "^$" \ 157 | grep -v "^$" \
157 > applet.lst 158 > applet_lst.tmp
158 while read name main junk; do 159 while read name main junk; do
159 160
160 echo "\ 161 echo "\
@@ -183,9 +184,8 @@ int main(int argc, char **argv)
183 } 184 }
184 rm -- "$sharedlib_dir/applet.c" $EXE.out 185 rm -- "$sharedlib_dir/applet.c" $EXE.out
185 strip -s --remove-section=.note --remove-section=.comment $EXE 186 strip -s --remove-section=.note --remove-section=.comment $EXE
186 echo "applet linked against libbusybox: $EXE"
187 187
188 done <applet.lst 188 done <applet_lst.tmp
189fi 189fi
190 190
191# libbusybox.so is needed only for -lbusybox at link time, 191# libbusybox.so is needed only for -lbusybox at link time,