aboutsummaryrefslogtreecommitdiffstats
path: root/com32/sysdump
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2011-04-26 01:18:18 -0700
committerH. Peter Anvin <hpa@zytor.com>2011-04-26 01:18:18 -0700
commitd5b9f24567a26562ec1822235cbd08256b96c335 (patch)
tree8e5a4c6245652d9b610c6308d3f505cdf9292919 /com32/sysdump
parentfaf815967c276bab95989d22a62b8378d7ebf6f3 (diff)
parent5b726ddd81fd77947e126b14c84fb843b63544c5 (diff)
downloadsyslinux-d5b9f24567a26562ec1822235cbd08256b96c335.tar.gz
syslinux-d5b9f24567a26562ec1822235cbd08256b96c335.tar.xz
syslinux-d5b9f24567a26562ec1822235cbd08256b96c335.zip
Merge remote-tracking branch 'mfleming/for-hpa/makefile-cleanup'
Resolved Conflicts: com32/hdt/Makefile com32/sysdump/Makefile Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/sysdump')
-rw-r--r--com32/sysdump/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/com32/sysdump/Makefile b/com32/sysdump/Makefile
index 3de8a5b8..e4290993 100644
--- a/com32/sysdump/Makefile
+++ b/com32/sysdump/Makefile
@@ -16,10 +16,11 @@
##
topdir = ../..
-include ../MCONFIG
+MAKEDIR = $(topdir)/mk
+include $(MAKEDIR)/com32.mk
-include $(topdir)/version.mk
-LIBS = ../libutil/libutil_com.a ../lib/libcom32.a ../libupload/libcom32upload.a $(LIBGCC)
+LIBS = ../libupload/libcom32upload.a
LNXLIBS = ../libutil/libutil_lnx.a
CFLAGS += -I$(com32) -I$(topdir)
@@ -44,7 +45,7 @@ CFLAGS += -DDATE='"$(DATE)"'
all: $(MODULES) $(TESTFILES)
-sysdump.elf : $(OBJS) $(LIBS) $(C_LIBS)
+sysdump.elf : $(OBJS) $(C_LIBS)
$(LD) $(LDFLAGS) -o $@ $^
tidy dist: