diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-07-04 11:09:54 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-07-04 11:21:19 +0100 |
| commit | 1f822f83b3d757c9a72f1eb99ebd723ee61e625b (patch) | |
| tree | bc5e1579aa92bb86a5a9d5ea6f761d3dcfa2c177 | |
| parent | 316f9636e3958ada609d506deca8db3aef395e54 (diff) | |
| download | syslinux-1f822f83b3d757c9a72f1eb99ebd723ee61e625b.tar.gz syslinux-1f822f83b3d757c9a72f1eb99ebd723ee61e625b.tar.xz syslinux-1f822f83b3d757c9a72f1eb99ebd723ee61e625b.zip | |
Fix Makefile install targets
Some Makefiles were still referring to libutil_com.a, even though we
stopped producing that file with commit 74518b8b691c ("elflink: Make
ELF the default object format"). Delete all references to avoid the
following install error,
install: cannot stat `libutil_com.a': No such file or directory
Remove the install target from com32/elflink as we no longer build any
of the test modules, and so don't need to install them.
Also, we need to add ldlinux.c32 to the list of modules that *must* be
installed for all targets, since it is required for Syslinux to
function correctly.
Reported-by: Dag Wieers <dag@wieers.com>
Reported-by: Michael D. Setzer II <mikes@kuentos.guam.net>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | com32/elflink/Makefile | 8 | ||||
| -rw-r--r-- | com32/libutil/Makefile | 2 | ||||
| -rw-r--r-- | mk/com32.mk | 3 |
4 files changed, 7 insertions, 10 deletions
@@ -35,7 +35,8 @@ MODULES = memdisk/memdisk memdump/memdump.com modules/*.com \ com32/menu/*.c32 com32/modules/*.c32 com32/mboot/*.c32 \ com32/hdt/*.c32 com32/rosh/*.c32 com32/gfxboot/*.c32 \ com32/sysdump/*.c32 com32/lua/src/*.c32 com32/chain/*.c32 \ - com32/lib/*.c32 com32/libutil/*.c32 com32/gpllib/*.c32 + com32/lib/*.c32 com32/libutil/*.c32 com32/gpllib/*.c32 \ + com32/elflink/ldlinux/*.c32 # syslinux.exe is BTARGET so as to not require everyone to have the # mingw suite installed @@ -83,7 +84,6 @@ EXTBOOTINSTALL = $(MODULES) # Things to install in /tftpboot NETINSTALLABLE = core/pxelinux.0 gpxe/gpxelinux.0 \ - com32/elflink/ldlinux/ldlinux.c32 \ $(MODULES) all: diff --git a/com32/elflink/Makefile b/com32/elflink/Makefile index aca37438..fce1be8c 100644 --- a/com32/elflink/Makefile +++ b/com32/elflink/Makefile @@ -19,8 +19,8 @@ test_memalign.elf : test_memalign.o $(LIBS) $(C_LIBS) $(LD) $(LDFLAGS) -o $@ $^ test_com32.elf: CFLAGS += -DELF_DEBUG -test_com32.elf: test_com32.o ../libutil/libutil_com.a ../lib/libcom32min.a $(LIBGCC) - $(LD) -n $(LDFLAGS) -o $@ test_com32.o ../libutil/libutil_com.a $(LIBGCC) --whole-archive ../lib/libcom32min.a -Map test_com32.map +test_com32.elf: test_com32.o ../lib/libcom32min.a $(LIBGCC) + $(LD) -n $(LDFLAGS) -o $@ test_com32.o $(LIBGCC) --whole-archive ../lib/libcom32min.a -Map test_com32.map tidy dist: rm -f *.o *.lo *.a *.lst *.elf .*.d *.map @@ -31,8 +31,6 @@ clean: tidy spotless: clean rm -f *~ \#* -install: all - mkdir -m 755 -p $(INSTALLROOT)$(AUXDIR) - install -m 644 $(MODULES) $(INSTALLROOT)$(AUXDIR) +install: -include .*.d diff --git a/com32/libutil/Makefile b/com32/libutil/Makefile index 13fb4193..93c0c11c 100644 --- a/com32/libutil/Makefile +++ b/com32/libutil/Makefile @@ -61,6 +61,6 @@ spotless: clean install: all mkdir -m 755 -p $(INSTALLROOT)$(COM32DIR) - install -m 644 libutil_com.a libutil_lnx.a $(INSTALLROOT)$(COM32DIR) + install -m 644 libutil_lnx.a $(INSTALLROOT)$(COM32DIR) -include .*.d diff --git a/mk/com32.mk b/mk/com32.mk index 262d2a6c..bfba0e1b 100644 --- a/mk/com32.mk +++ b/mk/com32.mk @@ -63,8 +63,7 @@ LNXCFLAGS = -I$(com32)/libutil/include $(GCCWARN) -O -g \ LNXSFLAGS = -g LNXLDFLAGS = -g -C_LIBS = $(com32)/libutil/libutil_com.a $(GPLLIB) \ - $(com32)/lib/libcom32.c32 $(LIBGCC) +C_LIBS = $(GPLLIB) $(com32)/lib/libcom32.c32 $(LIBGCC) C_LNXLIBS = $(com32)/libutil/libutil_lnx.a .SUFFIXES: .lss .c .lo .o .elf .c32 .lnx |