aboutsummaryrefslogtreecommitdiffstats
path: root/com32
diff options
context:
space:
mode:
Diffstat (limited to 'com32')
-rw-r--r--com32/cmenu/Makefile4
-rw-r--r--com32/libutil/Makefile5
-rw-r--r--com32/rosh/Makefile2
-rw-r--r--com32/samples/Makefile2
4 files changed, 6 insertions, 7 deletions
diff --git a/com32/cmenu/Makefile b/com32/cmenu/Makefile
index f827afd2..d51b2e84 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 42f69dcf..5aa7ceb8 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 a894c847..5b54225b 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 c7abaddb..f6ae00ab 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