diff options
| author | Michal Soltys <soltys@ziu.info> | 2011-05-10 13:54:35 +0200 |
|---|---|---|
| committer | Michal Soltys <soltys@ziu.info> | 2011-05-10 13:54:35 +0200 |
| commit | 950ca375a4da78b5707e5a4bc292e0ae095de3f4 (patch) | |
| tree | 45fba74c0009a7900b6a706042016afcf5ac7350 | |
| parent | 312d090bf8eddc8c02189693b8bab89d6e7282f2 (diff) | |
| parent | 2613174223371677d0a701a69cb7468947940d65 (diff) | |
| download | syslinux-950ca375a4da78b5707e5a4bc292e0ae095de3f4.tar.gz | |
Merge remote branch 'origin/master' into chaindev
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | Makefile.private | 1 | ||||
| -rw-r--r-- | extlinux/Makefile | 5 | ||||
| -rw-r--r-- | libinstaller/Makefile | 2 | ||||
| -rw-r--r-- | linux/Makefile | 5 | ||||
| -rw-r--r-- | mk/syslinux.mk | 1 | ||||
| -rwxr-xr-x | mtools/Makefile | 5 | ||||
| -rw-r--r-- | utils/Makefile | 16 |
8 files changed, 34 insertions, 8 deletions
@@ -98,6 +98,13 @@ installer: installer-local: $(ITARGET) $(BINFILES) +strip: + $(MAKE) strip-local + set -e ; for i in $(ISUBDIRS); do $(MAKE) -C $$i strip ; done + -ls -l $(BOBJECTS) $(IOBJECTS) + +strip-local: + version.gen: version version.pl $(PERL) version.pl $< $@ '%define < @' version.h: version version.pl diff --git a/Makefile.private b/Makefile.private index 6ca0598f..972abc24 100644 --- a/Makefile.private +++ b/Makefile.private @@ -38,6 +38,7 @@ burn: isolinux.iso official: $(MAKE) spotless CC='$(CC) -m32' $(MAKE) all CC='$(CC) -m32' + $(MAKE) strip CC='$(CC) -m32' $(MAKE) dist CC='$(CC) -m32' release: diff --git a/extlinux/Makefile b/extlinux/Makefile index 5da19e4a..12213d88 100644 --- a/extlinux/Makefile +++ b/extlinux/Makefile @@ -22,7 +22,7 @@ OPTFLAGS = -g -Os INCLUDES = -I. -I.. -I../libinstaller CFLAGS = $(GCCWARN) -Wno-sign-compare -D_FILE_OFFSET_BITS=64 \ $(OPTFLAGS) $(INCLUDES) -LDFLAGS = # -s +LDFLAGS = SRCS = main.c \ ../libinstaller/syslxmod.c \ @@ -54,6 +54,9 @@ installer: extlinux extlinux: $(OBJS) $(CC) $(LDFLAGS) -o $@ $^ +strip: + $(STRIP) extlinux + %.o: %.c $(CC) $(UMAKEDEPS) $(CFLAGS) -c -o $@ $< %.i: %.c diff --git a/libinstaller/Makefile b/libinstaller/Makefile index 2beb9315..e67a4686 100644 --- a/libinstaller/Makefile +++ b/libinstaller/Makefile @@ -26,3 +26,5 @@ clean: tidy dist: tidy spotless: clean + +strip: diff --git a/linux/Makefile b/linux/Makefile index b9dac179..82bf1118 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -18,7 +18,7 @@ topdir = .. MAKEDIR = $(topdir)/mk include $(MAKEDIR)/syslinux.mk -OPTFLAGS = -g -O0 -Dalloca=malloc +OPTFLAGS = -g -Os INCLUDES = -I. -I.. -I../libinstaller CFLAGS = $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) LDFLAGS = @@ -57,6 +57,9 @@ syslinux: $(OBJS) syslinux-nomtools: syslinux ln -f $< $@ +strip: + $(STRIP) syslinux syslinux-nomtools + %.o: %.c $(CC) $(UMAKEDEPS) $(CFLAGS) -c -o $@ $< %.i: %.c diff --git a/mk/syslinux.mk b/mk/syslinux.mk index 5f05870e..6d87187f 100644 --- a/mk/syslinux.mk +++ b/mk/syslinux.mk @@ -53,6 +53,7 @@ OBJCOPY = objcopy AR = ar NM = nm RANLIB = ranlib +STRIP = strip GZIPPROG = gzip XZ = xz PNGTOPNM = pngtopnm diff --git a/mtools/Makefile b/mtools/Makefile index 04e9d7de..3e172fd6 100755 --- a/mtools/Makefile +++ b/mtools/Makefile @@ -5,7 +5,7 @@ include $(MAKEDIR)/syslinux.mk OPTFLAGS = -g -Os INCLUDES = -I. -I.. -I../libfat -I../libinstaller CFLAGS = $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) -LDFLAGS = -s +LDFLAGS = SRCS = syslinux.c \ ../libinstaller/fat.c \ @@ -37,6 +37,9 @@ installer: syslinux syslinux: $(OBJS) $(CC) $(LDFLAGS) -o $@ $^ +strip: + $(STRIP) syslinux + %.o: %.c $(CC) $(UMAKEDEPS) $(CFLAGS) -c -o $@ $< %.i: %.c diff --git a/utils/Makefile b/utils/Makefile index eed07bba..acda8c05 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -19,12 +19,15 @@ MAKEDIR = $(topdir)/mk include $(MAKEDIR)/syslinux.mk CFLAGS = $(GCCWARN) -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -LDFLAGS = -O2 -s +LDFLAGS = -O2 -TARGETS = mkdiskimage isohybrid gethostip memdiskfind -TARGETS += isohybrid.pl # about to be obsoleted -ASIS = keytab-lilo lss16toppm md5pass ppmtolss16 sha1pass syslinux2ansi \ - pxelinux-options +C_TARGETS = isohybrid gethostip memdiskfind +SCRIPT_TARGETS = mkdiskimage +SCRIPT_TARGETS += isohybrid.pl # about to be obsoleted +ASIS = keytab-lilo lss16toppm md5pass ppmtolss16 sha1pass \ + syslinux2ansi pxelinux-options + +TARGETS = $(C_TARGETS) $(SCRIPT_TARGETS) ISOHDPFX = ../mbr/isohdpfx.bin ../mbr/isohdpfx_f.bin ../mbr/isohdpfx_c.bin \ ../mbr/isohdppx.bin ../mbr/isohdppx_f.bin ../mbr/isohdppx_c.bin @@ -70,4 +73,7 @@ install: installer mkdir -m 755 -p $(INSTALLROOT)$(BINDIR) install -m 755 $(TARGETS) $(ASIS) $(INSTALLROOT)$(BINDIR) +strip: + $(STRIP) $(C_TARGETS) + -include .*.d |