diff options
| -rw-r--r-- | com32/cmenu/Makefile | 8 | ||||
| -rw-r--r-- | com32/modules/Makefile | 18 | ||||
| -rw-r--r-- | com32/rosh/Makefile | 4 | ||||
| -rw-r--r-- | com32/samples/Makefile | 5 | ||||
| -rw-r--r-- | mk/elf.mk | 2 |
5 files changed, 12 insertions, 25 deletions
diff --git a/com32/cmenu/Makefile b/com32/cmenu/Makefile index c6e0cae3..beb8dd28 100644 --- a/com32/cmenu/Makefile +++ b/com32/cmenu/Makefile @@ -17,16 +17,16 @@ NOGPL := 1 +LIBS = libmenu/libmenu.c32 \ + $(com32)/libutil/libutil_com.c32 \ + $(com32)/lib/libcom32.c32 + topdir = ../.. MAKEDIR = $(topdir)/mk include $(MAKEDIR)/elf.mk CFLAGS += -I./libmenu -LIBS = libmenu/libmenu.c32 \ - $(com32)/libutil/libutil_com.c32 \ - $(com32)/lib/libcom32.c32 - 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 diff --git a/com32/modules/Makefile b/com32/modules/Makefile index 8d94cfec..8f5b7692 100644 --- a/com32/modules/Makefile +++ b/com32/modules/Makefile @@ -15,6 +15,9 @@ ## COM32 standard modules ## +LIBS = $(com32)/gpllib/libcom32gpl.c32 $(com32)/lib/libcom32.c32 \ + $(com32)/libutil/libutil_com.c32 + topdir = ../.. MAKEDIR = $(topdir)/mk include $(MAKEDIR)/elf.mk @@ -28,21 +31,6 @@ MODULES = config.c32 ethersel.c32 dmitest.c32 cpuidtest.c32 \ TESTFILES = -LDFLAGS_cpuidtest.o = $(com32)/gpllib/libcom32gpl.c32 -LDFLAGS_disk.o = $(com32)/gpllib/libcom32gpl.c32 -LDFLAGS_ethersel.o = $(com32)/lib/libcom32.c32 -LDFLAGS_gpxecmd.o = $(com32)/lib/libcom32.c32 -LDFLAGS_host.o = $(com32)/lib/libcom32.c32 -LDFLAGS_ifcpu.o = $(com32)/libutil/libutil_com.c32 \ - $(com32)/gpllib/libcom32gpl.c32 -LDFLAGS_kbdmap.o = $(com32)/lib/libcom32.c32 -LDFLAGS_linux.o = $(com32)/lib/libcom32.c32 -LDFLAGS_pxechn.o = $(com32)/lib/libcom32.c32 \ - $(com32)/libutil/libutil_com.c32 -LDFLAGS_sanboot.o = $(com32)/lib/libcom32.c32 -LDFLAGS_vpdtest.o = $(com32)/gpllib/libcom32gpl.c32 -LDFLAGS_zzjson.o = $(com32)/gpllib/libcom32gpl.c32 - all: $(MODULES) $(TESTFILES) .PRECIOUS: %.o diff --git a/com32/rosh/Makefile b/com32/rosh/Makefile index f3283952..a894c847 100644 --- a/com32/rosh/Makefile +++ b/com32/rosh/Makefile @@ -16,6 +16,8 @@ ## ROSH Read Only Shell ## +LIBS = $(com32)/libutil/libutil_com.c32 $(com32)/lib/libcom32.c32 + topdir = ../.. MAKEDIR = $(topdir)/mk include $(MAKEDIR)/rosh.mk @@ -34,8 +36,6 @@ endif CFLAGS += -DDATE='"$(DATE)"' LNXCFLAGS += -DDATE='"$(DATE)"' -LDFLAGS_rosh.o = $(com32)/libutil/libutil_com.c32 $(com32)/lib/libcom32.c32 - rosh.o: rosh.h rosh.lo: rosh.h diff --git a/com32/samples/Makefile b/com32/samples/Makefile index bca197ed..c7abaddb 100644 --- a/com32/samples/Makefile +++ b/com32/samples/Makefile @@ -14,13 +14,12 @@ ## samples for syslinux users ## +LIBS = $(com32)/libutil/libutil_com.c32 + topdir = ../.. MAKEDIR = $(topdir)/mk include $(MAKEDIR)/elf.mk -LDFLAGS_fancyhello.o = $(com32)/libutil/libutil_com.c32 -LDFLAGS_keytest.o = $(com32)/libutil/libutil_com.c32 - all: hello.c32 resolv.c32 serialinfo.c32 \ localboot.c32 \ fancyhello.c32 fancyhello.lnx \ @@ -82,4 +82,4 @@ C_LNXLIBS = $(com32)/libutil/libutil_lnx.a \ $(CC) $(LNXCFLAGS) -o $@ $^ %.c32: %.o $(LIBS) - $(LD) $(LDFLAGS_$^) $(LDFLAGS) -o $@ $^ + $(LD) $(LDFLAGS) -o $@ $^ |