diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2011-04-26 01:18:18 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2011-04-26 01:18:18 -0700 |
| commit | d5b9f24567a26562ec1822235cbd08256b96c335 (patch) | |
| tree | 8e5a4c6245652d9b610c6308d3f505cdf9292919 /com32/hdt/Makefile | |
| parent | faf815967c276bab95989d22a62b8378d7ebf6f3 (diff) | |
| parent | 5b726ddd81fd77947e126b14c84fb843b63544c5 (diff) | |
| download | syslinux-d5b9f24567a26562ec1822235cbd08256b96c335.tar.gz | |
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/hdt/Makefile')
| -rw-r--r-- | com32/hdt/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/com32/hdt/Makefile b/com32/hdt/Makefile index edacd85f..b4f4e359 100644 --- a/com32/hdt/Makefile +++ b/com32/hdt/Makefile @@ -16,11 +16,11 @@ ## topdir = ../.. -include ../MCONFIG +MAKEDIR = $(topdir)/mk +include $(MAKEDIR)/com32.mk -LIBS = ../cmenu/libmenu/libmenu.a ../libutil/libutil_com.a \ - ../lib/libcom32.a ../libupload/libcom32upload.a $(LIBGCC) -CFLAGS += -I$(com32)/cmenu/libmenu -I$(com32) +LIBS = ../cmenu/libmenu/libmenu.a ../libupload/libcom32upload.a +CFLAGS += -I$(com32)/cmenu/libmenu MODULES = hdt.c32 TESTFILES = |