aboutsummaryrefslogtreecommitdiffstats
path: root/com32/samples
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/samples
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/samples')
-rw-r--r--com32/samples/Makefile5
1 files changed, 2 insertions, 3 deletions
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 \