diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-11-05 13:13:25 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-11-05 13:21:04 +0000 |
| commit | 0b26e59c8f5dc7a8a124a033a78e08c7a2028bcd (patch) | |
| tree | 9a892c852fabd0a75d10c856105b4488cc87f66c /com32/modules/Makefile | |
| parent | cdeba8ac82f529a3a4a544c4e8346887ef81cb74 (diff) | |
| parent | b210bd5bfd0d7182b0a65f507c7557eeb90d5b16 (diff) | |
| download | syslinux-0b26e59c8f5dc7a8a124a033a78e08c7a2028bcd.tar.gz | |
Merge tag 'syslinux-5.00-pre9' into for-hpa/elflink/firmware
This merge also includes the Syslinux-4.06 release.
Conflicts:
Makefile
com32/hdt/Makefile
com32/modules/Makefile
com32/samples/hello.c
mtools/Makefile
Diffstat (limited to 'com32/modules/Makefile')
| -rw-r--r-- | com32/modules/Makefile | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/com32/modules/Makefile b/com32/modules/Makefile index 392c720f..d87127dc 100644 --- a/com32/modules/Makefile +++ b/com32/modules/Makefile @@ -15,10 +15,6 @@ ## COM32 standard modules ## -LIBS = $(objdir)/com32/gpllib/libcom32gpl.c32 \ - $(objdir)/com32/lib/libcom32.c32 \ - $(objdir)/com32/libutil/libutil_com.c32 - VPATH = $(SRC) include $(MAKEDIR)/elf.mk @@ -27,7 +23,7 @@ MODULES = config.c32 ethersel.c32 dmitest.c32 cpuidtest.c32 \ meminfo.c32 sdi.c32 sanboot.c32 ifcpu64.c32 vesainfo.c32 \ kbdmap.c32 cmd.c32 vpdtest.c32 host.c32 ls.c32 gpxecmd.c32 \ ifcpu.c32 cpuid.c32 cat.c32 pwd.c32 ifplop.c32 zzjson.c32 \ - whichsys.c32 hello.c32 pxechn.c32 + whichsys.c32 prdhcp.c32 pxechn.c32 kontron_wdt.c32 ifmemdsk.c32 TESTFILES = @@ -37,7 +33,7 @@ all: $(MODULES) $(TESTFILES) dmitest.o: dmitest.c $(CC) $(CFLAGS) $(GPLINCLUDE) -c -o $@ $< -dmitest.c32 : dmi_utils.o dmitest.o $(GPLLIB) $(LIBS) $(C_LIBS) +dmitest.c32 : dmi_utils.o dmitest.o $(C_LIBS) $(LD) $(LDFLAGS) -o $@ $^ tidy dist: |