path: root/com32
diff options
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 /com32
parent316f9636e3958ada609d506deca8db3aef395e54 (diff)
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 'com32')
2 files changed, 4 insertions, 6 deletions
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)
-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