diff options
| author | Michal Soltys <soltys@ziu.info> | 2011-05-04 15:46:29 +0200 |
|---|---|---|
| committer | Michal Soltys <soltys@ziu.info> | 2011-05-04 15:46:29 +0200 |
| commit | e4a46d8e86b3a14decc010d5cbd371922bdbb94b (patch) | |
| tree | d58aabf4be68f2d83fad4252840cfb2888252f5b /com32/modules/Makefile | |
| parent | 22411fad71c8949dbbe5880ae8a65043ca858872 (diff) | |
| parent | cf3ba289e440cc9e764243a02b8a474ebde70da7 (diff) | |
| download | syslinux-e4a46d8e86b3a14decc010d5cbd371922bdbb94b.tar.gz | |
Merge branch 'master' into chaindev
Conflicts:
com32/Makefile
com32/modules/chain.c
Note: add ReactOS' stuff introduced in old chain.c
Signed-off-by: Michal Soltys <soltys@ziu.info>
Diffstat (limited to 'com32/modules/Makefile')
| -rw-r--r-- | com32/modules/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/com32/modules/Makefile b/com32/modules/Makefile index e1b62b52..1b2854f5 100644 --- a/com32/modules/Makefile +++ b/com32/modules/Makefile @@ -16,13 +16,14 @@ ## topdir = ../.. -include ../MCONFIG +MAKEDIR = $(topdir)/mk +include $(MAKEDIR)/com32.mk MODULES = config.c32 ethersel.c32 dmitest.c32 cpuidtest.c32 \ disk.c32 pcitest.c32 elf.c32 linux.c32 reboot.c32 pmload.c32 \ meminfo.c32 sdi.c32 sanboot.c32 ifcpu64.c32 vesainfo.c32 \ kbdmap.c32 cmd.c32 vpdtest.c32 host.c32 ls.c32 gpxecmd.c32 \ - ifcpu.c32 cpuid.c32 cat.c32 pwd.c32 ifplop.c32 whichsys.c32 + ifcpu.c32 cpuid.c32 cat.c32 pwd.c32 ifplop.c32 zzjson.c32 whichsys.c32 TESTFILES = |