diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2011-04-25 17:19:32 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2011-04-25 17:19:32 -0700 |
| commit | 6bb618c959ffc6d462ce597f4e1f0e6c4baa7fa3 (patch) | |
| tree | eb738bf1a45e1fe0ee17fca8509c96a3579a6592 /com32/sysdump/Makefile | |
| parent | 3b772bb6588a28fd5741ca86f579e3838d96eb80 (diff) | |
| parent | 0c8bfd91ab11a00b796f32982a30414c8bac7ec9 (diff) | |
| download | syslinux-4.10-pre6.tar.gz | |
Merge remote-tracking branch 'origin/master' into lwipsyslinux-4.10-pre6
Resolved Conflicts:
com32/include/netinet/in.h
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/sysdump/Makefile')
| -rw-r--r-- | com32/sysdump/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/com32/sysdump/Makefile b/com32/sysdump/Makefile index bffee3a2..3de8a5b8 100644 --- a/com32/sysdump/Makefile +++ b/com32/sysdump/Makefile @@ -19,9 +19,11 @@ topdir = ../.. include ../MCONFIG -include $(topdir)/version.mk -LIBS = ../libutil/libutil_com.a ../lib/libcom32.a $(LIBGCC) +LIBS = ../libutil/libutil_com.a ../lib/libcom32.a ../libupload/libcom32upload.a $(LIBGCC) LNXLIBS = ../libutil/libutil_lnx.a +CFLAGS += -I$(com32) -I$(topdir) + MODULES = sysdump.c32 TESTFILES = |