aboutsummaryrefslogtreecommitdiffstats
path: root/com32/modules
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-08-13 16:45:11 +0100
committerMatt Fleming <matt.fleming@intel.com>2012-08-13 16:45:37 +0100
commitfe084791a5e8c0985717d990d26652f416d12f15 (patch)
treecae01d8061e6f8ef224ed98beb021e20d3e9b6c1 /com32/modules
parentb6b97c945d171aebc30510249a77581cd57fc8e7 (diff)
parentd1d03dee6bc961b0afd8dfc68fd35772ecded8be (diff)
downloadsyslinux-fe084791a5e8c0985717d990d26652f416d12f15.tar.gz
syslinux-fe084791a5e8c0985717d990d26652f416d12f15.tar.xz
syslinux-fe084791a5e8c0985717d990d26652f416d12f15.zip
Merge remote-tracking branch 'mfleming/elflink' into for-hpa/elflink/firmware
Conflicts: com32/lib/sys/module/common.c
Diffstat (limited to 'com32/modules')
-rw-r--r--com32/modules/Makefile18
1 files changed, 3 insertions, 15 deletions
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