aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-07-04 11:09:54 +0100
committerMatt Fleming <matt.fleming@intel.com>2012-07-04 11:21:19 +0100
commit1f822f83b3d757c9a72f1eb99ebd723ee61e625b (patch)
treebc5e1579aa92bb86a5a9d5ea6f761d3dcfa2c177 /Makefile
parent316f9636e3958ada609d506deca8db3aef395e54 (diff)
downloadsyslinux-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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 97f90a83..499ca5e3 100644
--- a/Makefile
+++ b/Makefile
@@ -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: