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/libutil/Makefile | |
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/libutil/Makefile')
-rw-r--r-- | com32/libutil/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/com32/libutil/Makefile b/com32/libutil/Makefile index 5e941658..094f1ff5 100644 --- a/com32/libutil/Makefile +++ b/com32/libutil/Makefile @@ -38,10 +38,10 @@ LIBOBJS = ansiline.o ansiraw.o keyname.o \ quicksort.o LNXLIBOBJS = $(patsubst %.o,%.lo,$(LIBOBJS)) -all: libutil_com.c32 libutil_lnx.a +all: libutil.c32 libutil_lnx.a -libutil_com.c32: $(LIBOBJS) - $(LD) $(LDFLAGS) -soname $(@F) -o $@ $^ +libutil.elf: $(LIBOBJS) + $(LD) $(LDFLAGS) -soname $(patsubst %.elf,%.c32,$(@F)) -o $@ $^ libutil_lnx.a: $(LNXLIBOBJS) rm -f $@ |