[syslinux:elflink] Rename libutil_com.c32 to libutil.c32
syslinux-bot for H. Peter Anvin
hpa at linux.intel.com
Thu Jan 17 11:00:02 PST 2013
Commit-ID: 1d4126ace5e4f4f0b326d0a8e903a5203c22936b
Gitweb: http://www.syslinux.org/commit/1d4126ace5e4f4f0b326d0a8e903a5203c22936b
Author: H. Peter Anvin <hpa at linux.intel.com>
AuthorDate: Thu, 17 Jan 2013 10:57:17 -0800
Committer: H. Peter Anvin <hpa at linux.intel.com>
CommitDate: Thu, 17 Jan 2013 10:57:17 -0800
Rename libutil_com.c32 to libutil.c32
Conform to 8.3 filenames for essential files.
Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
---
com32/cmenu/Makefile | 4 ++--
com32/libutil/Makefile | 5 ++---
com32/rosh/Makefile | 2 +-
com32/samples/Makefile | 2 +-
mk/elf.mk | 2 +-
5 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/com32/cmenu/Makefile b/com32/cmenu/Makefile
index f827afd..d51b2e8 100644
--- a/com32/cmenu/Makefile
+++ b/com32/cmenu/Makefile
@@ -18,7 +18,7 @@
NOGPL := 1
LIBS = libmenu/libmenu.c32 \
- $(com32)/libutil/libutil_com.c32 \
+ $(com32)/libutil/libutil.c32 \
$(com32)/lib/libcom32.c32
topdir = ../..
@@ -29,7 +29,7 @@ CFLAGS += -I./libmenu
LIBMENU = libmenu/syslnx.o libmenu/com32io.o libmenu/tui.o \
libmenu/menu.o libmenu/passwords.o libmenu/des.o libmenu/help.o \
- $(com32)/libutil/libutil_com.c32 $(com32)/lib/libcom32.c32
+ $(com32)/libutil/libutil.c32 $(com32)/lib/libcom32.c32
CMENUS = $(patsubst %.c,%.c32,$(wildcard *.c))
IMENUS = $(patsubst %.menu,%.c32,$(wildcard *.menu))
diff --git a/com32/libutil/Makefile b/com32/libutil/Makefile
index 42f69dc..5aa7ceb 100644
--- a/com32/libutil/Makefile
+++ b/com32/libutil/Makefile
@@ -39,10 +39,9 @@ LIBOBJS = ansiline.o ansiraw.o keyname.o \
quicksort.o
LNXLIBOBJS = $(patsubst %.o,%.lo,$(LIBOBJS))
-all: libutil_com.c32 libutil_lnx.a
+all: libutil.c32 libutil_lnx.a
-.PRECIOUS: libutil_com.elf
-libutil_com.elf: $(LIBOBJS)
+libutil.elf: $(LIBOBJS)
$(LD) $(LDFLAGS) -soname $(patsubst %.elf,%.c32,$(@F)) -o $@ $^
libutil_lnx.a: $(LNXLIBOBJS)
diff --git a/com32/rosh/Makefile b/com32/rosh/Makefile
index a894c84..5b54225 100644
--- a/com32/rosh/Makefile
+++ b/com32/rosh/Makefile
@@ -16,7 +16,7 @@
## ROSH Read Only Shell
##
-LIBS = $(com32)/libutil/libutil_com.c32 $(com32)/lib/libcom32.c32
+LIBS = $(com32)/libutil/libutil.c32 $(com32)/lib/libcom32.c32
topdir = ../..
MAKEDIR = $(topdir)/mk
diff --git a/com32/samples/Makefile b/com32/samples/Makefile
index c7abadd..f6ae00a 100644
--- a/com32/samples/Makefile
+++ b/com32/samples/Makefile
@@ -14,7 +14,7 @@
## samples for syslinux users
##
-LIBS = $(com32)/libutil/libutil_com.c32
+LIBS = $(com32)/libutil/libutil.c32
topdir = ../..
MAKEDIR = $(topdir)/mk
diff --git a/mk/elf.mk b/mk/elf.mk
index f759b70..82e03ba 100644
--- a/mk/elf.mk
+++ b/mk/elf.mk
@@ -54,7 +54,7 @@ LNXCFLAGS = -I$(com32)/libutil/include -W -Wall -O -g -D_GNU_SOURCE
LNXSFLAGS = -g
LNXLDFLAGS = -g
-C_LIBS = $(com32)/libutil/libutil_com.c32 $(GPLLIB) \
+C_LIBS = $(com32)/libutil/libutil.c32 $(GPLLIB) \
$(com32)/lib/libcom32.c32
C_LNXLIBS = $(com32)/libutil/libutil_lnx.a \
$(com32)/elflink/ldlinux/ldlinux_lnx.a
More information about the Syslinux-commits
mailing list