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/hdt/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/hdt/Makefile')
| -rw-r--r-- | com32/hdt/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/com32/hdt/Makefile b/com32/hdt/Makefile index 386c7472..362b4874 100644 --- a/com32/hdt/Makefile +++ b/com32/hdt/Makefile @@ -19,10 +19,7 @@ VPATH = $(SRC) include $(MAKEDIR)/elf.mk LIBS = $(objdir)/com32/libupload/libcom32upload.a -C_LIBS += $(objdir)/com32/cmenu/libmenu/libmenu.c32 \ - $(objdir)/com32/libutil/libutil_com.c32 \ - $(objdir)/com32/lib/libcom32.c32 \ - $(objdir)/com32/gpllib/libcom32gpl.c32 +C_LIBS += $(objdir)/com32/cmenu/libmenu/libmenu.c32 CFLAGS += -I$(com32)/cmenu/libmenu -I$(com32) MODULES = hdt.c32 @@ -77,6 +74,8 @@ hdt.img: hdt.c32 $(FLOPPY_DIR)/hdt.cfg $(FLOPPY_DIR)/mtools.conf $(topdir)/mtool MTOOLSRC=$(PWD)/$(FLOPPY_DIR)/mtools.conf $(MCOPY) $(FLOPPY_DIR)/syslinux.cfg a: MTOOLSRC=$(PWD)/$(FLOPPY_DIR)/mtools.conf $(MCOPY) $(FLOPPY_DIR)/$(MEMTEST) a: MTOOLSRC=$(PWD)/$(FLOPPY_DIR)/mtools.conf $(MCOPY) $(ART_DIR)/backgnd.png a: + MTOOLSRC=$(PWD)/$(FLOPPY_DIR)/mtools.conf $(MCOPY) $(ART_DIR)/display.png a: + MTOOLSRC=$(PWD)/$(FLOPPY_DIR)/mtools.conf $(MCOPY) $(ART_DIR)/red.png a: mv hdt.img hdt-$(VERSION).img ln -sf hdt-$(VERSION).img hdt.img @@ -97,6 +96,8 @@ hdt.iso: hdt.c32 $(topdir)/core/isolinux.bin $(FLOPPY_DIR)/hdt.cfg memtest cp $(MENU_COM32) $(ISO_DIR)/$(ISOLINUX_DIR) cp $(CHAIN_COM32) $(ISO_DIR)/$(ISOLINUX_DIR) cp -av $(ART_DIR)/backgnd.png $(ISO_DIR)/$(ISOLINUX_DIR) + cp -av $(ART_DIR)/display.png $(ISO_DIR)/$(ISOLINUX_DIR) + cp -av $(ART_DIR)/red.png $(ISO_DIR)/$(ISOLINUX_DIR) -[ ! -f $(GZ_PCI_IDS_FILE) ] && cp /usr/share/hwdata/pci.ids $(PCI_IDS_FILE) && $(GZIPPROG) $(PCI_IDS_FILE) -[ ! -f $(GZ_PCI_IDS_FILE) ] && cp /usr/share/pci.ids $(PCI_IDS_FILE) && $(GZIPPROG) $(PCI_IDS_FILE) -[ -f $(MODULES_ALIAS_FILE) ] && cp $(MODULES_ALIAS_FILE) $(ISO_DIR)/$(ISOLINUX_DIR)\ |