diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2013-01-29 14:01:07 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2013-01-29 15:11:28 +0000 |
| commit | bf20364b582c383b4927f898de213b1cc0981a80 (patch) | |
| tree | 5412e0c14cf74df0d7ea29ff182e23d3281aac3e /com32/gpllib | |
| parent | afd985f6eec18a0f66a8fc55f9c5e3431128310f (diff) | |
| parent | a2d79191b501276026a0a16ec2fa664630a20476 (diff) | |
| download | syslinux-bf20364b582c383b4927f898de213b1cc0981a80.tar.gz | |
Merge tag 'syslinux-5.01' into firmwaresyslinux-6.00-pre4
Conflicts:
Makefile
NEWS
com32/cmenu/Makefile
com32/elflink/ldlinux/Makefile
com32/gfxboot/Makefile
com32/gpllib/Makefile
com32/include/sys/module.h
com32/lib/Makefile
com32/lib/sys/module/elf_module.c
com32/menu/Makefile
com32/rosh/Makefile
com32/samples/Makefile
core/init.c
mk/elf.mk
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'com32/gpllib')
| -rw-r--r-- | com32/gpllib/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/com32/gpllib/Makefile b/com32/gpllib/Makefile index 4d0bb82f..e3e30d76 100644 --- a/com32/gpllib/Makefile +++ b/com32/gpllib/Makefile @@ -17,14 +17,14 @@ AUXDIR = $(DATADIR)/syslinux INCDIR = /usr/include COM32DIR = $(AUXDIR)/com32 -all: makeoutputdirs libcom32gpl.c32 +all: makeoutputdirs libgpl.c32 makeoutputdirs: @mkdir -p $(foreach b, \ $(addprefix $(OBJ),$(sort $(dir $(LIBOBJS)))),$(b)) -libcom32gpl.c32 : $(LIBOBJS) - $(LD) -shared $(LDFLAGS) -soname $(@F) -o $@ $^ +libgpl.elf : $(LIBOBJS) + $(LD) -shared $(LDFLAGS) -soname $(patsubst %.elf,%.c32,$(@F)) -o $@ $^ tidy dist clean: find . \( -name \*.o -o -name .\*.d -o -name \*.tmp \) -print0 | \ @@ -38,7 +38,7 @@ spotless: clean # there is a better way to do it. install: all mkdir -m 755 -p $(INSTALLROOT)$(COM32DIR) - install -m 644 libcom32gpl.c32 $(INSTALLROOT)$(COM32DIR) + install -m 644 libgpl.c32 $(INSTALLROOT)$(COM32DIR) mkdir -p $(INSTALLROOT)$(COM32DIR)/include/ cp -r $(SRC)/../gplinclude $(INSTALLROOT)$(COM32DIR)/include/ |