aboutsummaryrefslogtreecommitdiffstats
path: root/com32/hdt/Makefile
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-04-06 16:33:43 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-04-06 16:33:43 -0700
commitb8f63328eb3061c23fd748964662f72220b408f6 (patch)
tree8f2d79ef96366a4093dc04118f9b326faac25db6 /com32/hdt/Makefile
parent2920515b1fe5dbf20cfa2f2890b154cd147831ec (diff)
downloadsyslinux.git-b8f63328eb3061c23fd748964662f72220b408f6.tar.gz
syslinux.git-b8f63328eb3061c23fd748964662f72220b408f6.tar.xz
syslinux.git-b8f63328eb3061c23fd748964662f72220b408f6.zip
Makefiles: try to make "make install" do the right thing
One more attempt at getting semi-sanity to "make install". Realistically, the install/netinstall/install-all/... needs to be pushed into the com32 Makefiles, but this is at least a quick hack. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/hdt/Makefile')
-rw-r--r--com32/hdt/Makefile78
1 files changed, 22 insertions, 56 deletions
diff --git a/com32/hdt/Makefile b/com32/hdt/Makefile
index 4056c76c..8f8cae21 100644
--- a/com32/hdt/Makefile
+++ b/com32/hdt/Makefile
@@ -1,81 +1,47 @@
## -----------------------------------------------------------------------
##
-## Copyright 2001-2009 H. Peter Anvin - All Rights Reserved
+## Copyright 2001-2008 H. Peter Anvin - All Rights Reserved
## Copyright 2009 Intel Corporation; author: H. Peter Anvin
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, Inc., 53 Temple Place Ste 330,
-## Boston MA 02111-1307, USA; either version 2 of the License, or
+## the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+## Boston MA 02110-1301, USA; either version 2 of the License, or
## (at your option) any later version; incorporated herein by reference.
##
## -----------------------------------------------------------------------
##
-## samples for syslinux users
+## Hardware Detection Tool
##
topdir = ../..
-include $(topdir)/MCONFIG.embedded
+include ../MCONFIG
-MODULES = hdt.c32
+LIBS = ../cmenu/libmenu/libmenu.a ../libutil/libutil_com.a \
+ ../lib/libcom32.a $(LIBGCC)
+CFLAGS += -I$(com32)/cmenu/libmenu
-INCLUDES = -I$(com32)/include -I$(com32)/cmenu/libmenu -I$(com32)/gplinclude\
- -I$(com32)/libutil/include
+MODULES = hdt.c32
+TESTFILES =
-LIBGCC := $(shell $(CC) $(GCCOPT) --print-libgcc)
-LIB = liboldcom32.a
+OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
-com32 = $(topdir)/com32
-LIBS = $(LIB) $(com32)/cmenu/libmenu/libmenu.a \
- $(com32)/gpllib/libcom32gpl.a \
- $(com32)/libutil/libutil_com.a $(com32)/lib/libcom32.a \
- $(LIBGCC)
+all: $(MODULES) $(TESTFILES)
-LDFLAGS = -m elf_i386 -T $(com32)/lib/com32.ld
-
-all: $(MODULES) $(LIB)
-
-.PRECIOUS: %.o
-%.o: %.S
- $(CC) $(SFLAGS) -c -o $@ $<
-
-.PRECIOUS: %.o
-%.o: %.c
- @$(CC) $(CFLAGS) -std=gnu99 -D__COM32__ -c -o $@ $<
-
-.PRECIOUS: %.elf
-%.elf: c32entry.o %.o $(LIB)
- @$(LD) -Ttext 0x101000 -e _start -o $@ $^
-
-hdt.elf: hdt.o hdt-ata.o hdt-menu.o hdt-menu-pci.o hdt-menu-kernel.o \
- hdt-menu-disk.o hdt-menu-dmi.o hdt-menu-processor.o \
- hdt-menu-syslinux.o hdt-menu-about.o \
- hdt-cli.o hdt-common.o hdt-cli-pci.o hdt-cli-dmi.o \
- hdt-cli-cpu.o hdt-cli-pxe.o hdt-cli-kernel.o \
- hdt-cli-syslinux.o hdt-cli-vesa.o\
- hdt-menu-pxe.o hdt-menu-summary.o hdt-menu-vesa.o\
- $(LIBS)
- @$(LD) $(LDFLAGS) -o $@ $^
-
-%.c32: %.elf
- @$(OBJCOPY) -O binary $< $@
-
-%.com: %.asm
- @$(NASM) $(NASMOPT) -f bin -o $@ -l $*.lst $<
-
-$(LIB):
- @rm -f $@
- @$(AR) cq $@ $^
- @$(RANLIB) $@
+hdt.elf : $(OBJS) $(LIBS) $(C_LIBS)
+ $(LD) $(LDFLAGS) -o $@ $^
tidy dist:
- @rm -f *.o *.a *.lst *.elf
-
-install: all
+ rm -f *.o *.lo *.a *.lst *.elf .*.d *.tmp
-# Don't specify *.com since mdiskchk.com can't be built using Linux tools
clean: tidy
- @rm -f *.o *.c32 *.c~ *.h~ Makefile~
+ rm -f *.lnx
spotless: clean
+ rm -f *.lss *.c32 *.com
+ rm -f *~ \#*
+
+install:
+
+-include .*.d