diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:41:00 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:41:00 +0000 |
| commit | 1118c95535ea51961437089fc3dece5ab4ea7e1b (patch) | |
| tree | 1515bd2376a6d6c5123791662307ce2ed90cdf36 /Makefile | |
| parent | 0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2 (diff) | |
| parent | 066f39956641300c1e5c6bfe6c11a115cea3e2cf (diff) | |
| download | busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.tar.gz busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.tar.bz2 busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.zip | |
Merge commit '066f39956641300c1e5c6bfe6c11a115cea3e2cf' into merge
Conflicts:
procps/ps.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
| @@ -965,10 +965,14 @@ CLEAN_FILES += busybox$(EXEEXT) busybox_unstripped* busybox.links \ | |||
| 965 | # Directories & files removed with 'make mrproper' | 965 | # Directories & files removed with 'make mrproper' |
| 966 | MRPROPER_DIRS += include/config include2 | 966 | MRPROPER_DIRS += include/config include2 |
| 967 | MRPROPER_FILES += .config .config.old include/asm .version .old_version \ | 967 | MRPROPER_FILES += .config .config.old include/asm .version .old_version \ |
| 968 | include/NUM_APPLETS.h \ | ||
| 968 | include/autoconf.h \ | 969 | include/autoconf.h \ |
| 969 | include/bbconfigopts.h \ | 970 | include/bbconfigopts.h \ |
| 971 | include/bbconfigopts_bz2.h \ | ||
| 970 | include/usage_compressed.h \ | 972 | include/usage_compressed.h \ |
| 971 | include/applet_tables.h \ | 973 | include/applet_tables.h \ |
| 974 | include/applets.h \ | ||
| 975 | include/usage.h \ | ||
| 972 | applets/usage \ | 976 | applets/usage \ |
| 973 | .kernelrelease Module.symvers tags TAGS cscope* \ | 977 | .kernelrelease Module.symvers tags TAGS cscope* \ |
| 974 | busybox_old | 978 | busybox_old |