commit-grub
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[2044] 2009-03-24 Pavel Roskin <address@hidden>


From: Pavel Roskin
Subject: [2044] 2009-03-24 Pavel Roskin <address@hidden>
Date: Tue, 24 Mar 2009 14:01:27 +0000

Revision: 2044
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2044
Author:   proski
Date:     2009-03-24 14:01:23 +0000 (Tue, 24 Mar 2009)
Log Message:
-----------
2009-03-24  Pavel Roskin  <address@hidden>

        * genmk.rb: Define ASM_FILE for *.S files for *.lst generation,
        not just for compilation.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/conf/common.mk
    trunk/grub2/conf/i386-coreboot.mk
    trunk/grub2/conf/i386-efi.mk
    trunk/grub2/conf/i386-ieee1275.mk
    trunk/grub2/conf/i386-pc.mk
    trunk/grub2/conf/i386.mk
    trunk/grub2/conf/powerpc-ieee1275.mk
    trunk/grub2/conf/sparc64-ieee1275.mk
    trunk/grub2/conf/x86_64-efi.mk
    trunk/grub2/genmk.rb

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-03-22 12:28:00 UTC (rev 2043)
+++ trunk/grub2/ChangeLog       2009-03-24 14:01:23 UTC (rev 2044)
@@ -1,3 +1,8 @@
+2009-03-24  Pavel Roskin  <address@hidden>
+
+       * genmk.rb: Define ASM_FILE for *.S files for *.lst generation,
+       not just for compilation.
+
 2009-03-22  Vladimir Serbinenko  <address@hidden>
 
        Move multiboot helper out of kernel

Modified: trunk/grub2/conf/common.mk
===================================================================
--- trunk/grub2/conf/common.mk  2009-03-22 12:28:00 UTC (rev 2043)
+++ trunk/grub2/conf/common.mk  2009-03-24 14:01:23 UTC (rev 2044)
@@ -652,13 +652,13 @@
 PARTMAPFILES += partmap-fshelp_mod-fs_fshelp.lst
 
 cmd-fshelp_mod-fs_fshelp.lst: fs/fshelp.c $(fs/fshelp.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(fshelp_mod_CFLAGS) -E $<         | sh 
$(srcdir)/gencmdlist.sh fshelp > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(fshelp_mod_CFLAGS) -E $<        | sh $(srcdir)/gencmdlist.sh 
fshelp > $@ || (rm -f $@; exit 1)
 
 fs-fshelp_mod-fs_fshelp.lst: fs/fshelp.c $(fs/fshelp.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(fshelp_mod_CFLAGS) -E $<         | sh $(srcdir)/genfslist.sh 
fshelp > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(fshelp_mod_CFLAGS) -E $<        | sh $(srcdir)/genfslist.sh 
fshelp > $@ || (rm -f $@; exit 1)
 
 partmap-fshelp_mod-fs_fshelp.lst: fs/fshelp.c $(fs/fshelp.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(fshelp_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genpartmaplist.sh fshelp > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(fshelp_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh fshelp > $@ || (rm -f $@; exit 1)
 
 
 fshelp_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -709,13 +709,13 @@
 PARTMAPFILES += partmap-fat_mod-fs_fat.lst
 
 cmd-fat_mod-fs_fat.lst: fs/fat.c $(fs/fat.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(fat_mod_CFLAGS) -E $<    | sh $(srcdir)/gencmdlist.sh fat > 
$@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(fat_mod_CFLAGS) -E $<           | sh $(srcdir)/gencmdlist.sh 
fat > $@ || (rm -f $@; exit 1)
 
 fs-fat_mod-fs_fat.lst: fs/fat.c $(fs/fat.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(fat_mod_CFLAGS) -E $<    | sh $(srcdir)/genfslist.sh fat > 
$@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(fat_mod_CFLAGS) -E $<           | sh $(srcdir)/genfslist.sh 
fat > $@ || (rm -f $@; exit 1)
 
 partmap-fat_mod-fs_fat.lst: fs/fat.c $(fs/fat.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(fat_mod_CFLAGS) -E $<    | sh $(srcdir)/genpartmaplist.sh 
fat > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(fat_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh fat > $@ || (rm -f $@; exit 1)
 
 
 fat_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -766,13 +766,13 @@
 PARTMAPFILES += partmap-ufs_mod-fs_ufs.lst
 
 cmd-ufs_mod-fs_ufs.lst: fs/ufs.c $(fs/ufs.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(ufs_mod_CFLAGS) -E $<    | sh $(srcdir)/gencmdlist.sh ufs > 
$@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(ufs_mod_CFLAGS) -E $<           | sh $(srcdir)/gencmdlist.sh 
ufs > $@ || (rm -f $@; exit 1)
 
 fs-ufs_mod-fs_ufs.lst: fs/ufs.c $(fs/ufs.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(ufs_mod_CFLAGS) -E $<    | sh $(srcdir)/genfslist.sh ufs > 
$@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(ufs_mod_CFLAGS) -E $<           | sh $(srcdir)/genfslist.sh 
ufs > $@ || (rm -f $@; exit 1)
 
 partmap-ufs_mod-fs_ufs.lst: fs/ufs.c $(fs/ufs.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(ufs_mod_CFLAGS) -E $<    | sh $(srcdir)/genpartmaplist.sh 
ufs > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(ufs_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh ufs > $@ || (rm -f $@; exit 1)
 
 
 ufs_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -823,13 +823,13 @@
 PARTMAPFILES += partmap-ext2_mod-fs_ext2.lst
 
 cmd-ext2_mod-fs_ext2.lst: fs/ext2.c $(fs/ext2.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(ext2_mod_CFLAGS) -E $<           | sh 
$(srcdir)/gencmdlist.sh ext2 > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(ext2_mod_CFLAGS) -E $<          | sh $(srcdir)/gencmdlist.sh 
ext2 > $@ || (rm -f $@; exit 1)
 
 fs-ext2_mod-fs_ext2.lst: fs/ext2.c $(fs/ext2.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(ext2_mod_CFLAGS) -E $<           | sh $(srcdir)/genfslist.sh 
ext2 > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(ext2_mod_CFLAGS) -E $<          | sh $(srcdir)/genfslist.sh 
ext2 > $@ || (rm -f $@; exit 1)
 
 partmap-ext2_mod-fs_ext2.lst: fs/ext2.c $(fs/ext2.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(ext2_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh ext2 > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(ext2_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genpartmaplist.sh ext2 > $@ || (rm -f $@; exit 1)
 
 
 ext2_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -880,13 +880,13 @@
 PARTMAPFILES += partmap-ntfs_mod-fs_ntfs.lst
 
 cmd-ntfs_mod-fs_ntfs.lst: fs/ntfs.c $(fs/ntfs.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(ntfs_mod_CFLAGS) -E $<           | sh 
$(srcdir)/gencmdlist.sh ntfs > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(ntfs_mod_CFLAGS) -E $<          | sh $(srcdir)/gencmdlist.sh 
ntfs > $@ || (rm -f $@; exit 1)
 
 fs-ntfs_mod-fs_ntfs.lst: fs/ntfs.c $(fs/ntfs.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(ntfs_mod_CFLAGS) -E $<           | sh $(srcdir)/genfslist.sh 
ntfs > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(ntfs_mod_CFLAGS) -E $<          | sh $(srcdir)/genfslist.sh 
ntfs > $@ || (rm -f $@; exit 1)
 
 partmap-ntfs_mod-fs_ntfs.lst: fs/ntfs.c $(fs/ntfs.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(ntfs_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh ntfs > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(ntfs_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genpartmaplist.sh ntfs > $@ || (rm -f $@; exit 1)
 
 
 ntfs_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -937,13 +937,13 @@
 PARTMAPFILES += partmap-ntfscomp_mod-fs_ntfscomp.lst
 
 cmd-ntfscomp_mod-fs_ntfscomp.lst: fs/ntfscomp.c $(fs/ntfscomp.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(ntfscomp_mod_CFLAGS) -E $<       | sh 
$(srcdir)/gencmdlist.sh ntfscomp > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(ntfscomp_mod_CFLAGS) -E $<      | sh $(srcdir)/gencmdlist.sh 
ntfscomp > $@ || (rm -f $@; exit 1)
 
 fs-ntfscomp_mod-fs_ntfscomp.lst: fs/ntfscomp.c $(fs/ntfscomp.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(ntfscomp_mod_CFLAGS) -E $<       | sh $(srcdir)/genfslist.sh 
ntfscomp > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(ntfscomp_mod_CFLAGS) -E $<      | sh $(srcdir)/genfslist.sh 
ntfscomp > $@ || (rm -f $@; exit 1)
 
 partmap-ntfscomp_mod-fs_ntfscomp.lst: fs/ntfscomp.c 
$(fs/ntfscomp.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(ntfscomp_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genpartmaplist.sh ntfscomp > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(ntfscomp_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genpartmaplist.sh ntfscomp > $@ || (rm -f $@; exit 1)
 
 
 ntfscomp_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -994,13 +994,13 @@
 PARTMAPFILES += partmap-minix_mod-fs_minix.lst
 
 cmd-minix_mod-fs_minix.lst: fs/minix.c $(fs/minix.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(minix_mod_CFLAGS) -E $<          | sh 
$(srcdir)/gencmdlist.sh minix > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(minix_mod_CFLAGS) -E $<         | sh $(srcdir)/gencmdlist.sh 
minix > $@ || (rm -f $@; exit 1)
 
 fs-minix_mod-fs_minix.lst: fs/minix.c $(fs/minix.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(minix_mod_CFLAGS) -E $<          | sh $(srcdir)/genfslist.sh 
minix > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(minix_mod_CFLAGS) -E $<         | sh $(srcdir)/genfslist.sh 
minix > $@ || (rm -f $@; exit 1)
 
 partmap-minix_mod-fs_minix.lst: fs/minix.c $(fs/minix.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(minix_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genpartmaplist.sh minix > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(minix_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genpartmaplist.sh minix > $@ || (rm -f $@; exit 1)
 
 
 minix_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1051,13 +1051,13 @@
 PARTMAPFILES += partmap-hfs_mod-fs_hfs.lst
 
 cmd-hfs_mod-fs_hfs.lst: fs/hfs.c $(fs/hfs.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(hfs_mod_CFLAGS) -E $<    | sh $(srcdir)/gencmdlist.sh hfs > 
$@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(hfs_mod_CFLAGS) -E $<           | sh $(srcdir)/gencmdlist.sh 
hfs > $@ || (rm -f $@; exit 1)
 
 fs-hfs_mod-fs_hfs.lst: fs/hfs.c $(fs/hfs.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(hfs_mod_CFLAGS) -E $<    | sh $(srcdir)/genfslist.sh hfs > 
$@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(hfs_mod_CFLAGS) -E $<           | sh $(srcdir)/genfslist.sh 
hfs > $@ || (rm -f $@; exit 1)
 
 partmap-hfs_mod-fs_hfs.lst: fs/hfs.c $(fs/hfs.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(hfs_mod_CFLAGS) -E $<    | sh $(srcdir)/genpartmaplist.sh 
hfs > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(hfs_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh hfs > $@ || (rm -f $@; exit 1)
 
 
 hfs_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1108,13 +1108,13 @@
 PARTMAPFILES += partmap-jfs_mod-fs_jfs.lst
 
 cmd-jfs_mod-fs_jfs.lst: fs/jfs.c $(fs/jfs.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(jfs_mod_CFLAGS) -E $<    | sh $(srcdir)/gencmdlist.sh jfs > 
$@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(jfs_mod_CFLAGS) -E $<           | sh $(srcdir)/gencmdlist.sh 
jfs > $@ || (rm -f $@; exit 1)
 
 fs-jfs_mod-fs_jfs.lst: fs/jfs.c $(fs/jfs.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(jfs_mod_CFLAGS) -E $<    | sh $(srcdir)/genfslist.sh jfs > 
$@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(jfs_mod_CFLAGS) -E $<           | sh $(srcdir)/genfslist.sh 
jfs > $@ || (rm -f $@; exit 1)
 
 partmap-jfs_mod-fs_jfs.lst: fs/jfs.c $(fs/jfs.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(jfs_mod_CFLAGS) -E $<    | sh $(srcdir)/genpartmaplist.sh 
jfs > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(jfs_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh jfs > $@ || (rm -f $@; exit 1)
 
 
 jfs_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1165,13 +1165,13 @@
 PARTMAPFILES += partmap-iso9660_mod-fs_iso9660.lst
 
 cmd-iso9660_mod-fs_iso9660.lst: fs/iso9660.c $(fs/iso9660.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(iso9660_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh iso9660 > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(iso9660_mod_CFLAGS) -E $<       | sh $(srcdir)/gencmdlist.sh 
iso9660 > $@ || (rm -f $@; exit 1)
 
 fs-iso9660_mod-fs_iso9660.lst: fs/iso9660.c $(fs/iso9660.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(iso9660_mod_CFLAGS) -E $<        | sh $(srcdir)/genfslist.sh 
iso9660 > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(iso9660_mod_CFLAGS) -E $<       | sh $(srcdir)/genfslist.sh 
iso9660 > $@ || (rm -f $@; exit 1)
 
 partmap-iso9660_mod-fs_iso9660.lst: fs/iso9660.c $(fs/iso9660.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(iso9660_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh iso9660 > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(iso9660_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genpartmaplist.sh iso9660 > $@ || (rm -f $@; exit 1)
 
 
 iso9660_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1222,13 +1222,13 @@
 PARTMAPFILES += partmap-xfs_mod-fs_xfs.lst
 
 cmd-xfs_mod-fs_xfs.lst: fs/xfs.c $(fs/xfs.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(xfs_mod_CFLAGS) -E $<    | sh $(srcdir)/gencmdlist.sh xfs > 
$@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(xfs_mod_CFLAGS) -E $<           | sh $(srcdir)/gencmdlist.sh 
xfs > $@ || (rm -f $@; exit 1)
 
 fs-xfs_mod-fs_xfs.lst: fs/xfs.c $(fs/xfs.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(xfs_mod_CFLAGS) -E $<    | sh $(srcdir)/genfslist.sh xfs > 
$@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(xfs_mod_CFLAGS) -E $<           | sh $(srcdir)/genfslist.sh 
xfs > $@ || (rm -f $@; exit 1)
 
 partmap-xfs_mod-fs_xfs.lst: fs/xfs.c $(fs/xfs.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(xfs_mod_CFLAGS) -E $<    | sh $(srcdir)/genpartmaplist.sh 
xfs > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(xfs_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh xfs > $@ || (rm -f $@; exit 1)
 
 
 xfs_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1279,13 +1279,13 @@
 PARTMAPFILES += partmap-affs_mod-fs_affs.lst
 
 cmd-affs_mod-fs_affs.lst: fs/affs.c $(fs/affs.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(affs_mod_CFLAGS) -E $<           | sh 
$(srcdir)/gencmdlist.sh affs > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(affs_mod_CFLAGS) -E $<          | sh $(srcdir)/gencmdlist.sh 
affs > $@ || (rm -f $@; exit 1)
 
 fs-affs_mod-fs_affs.lst: fs/affs.c $(fs/affs.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(affs_mod_CFLAGS) -E $<           | sh $(srcdir)/genfslist.sh 
affs > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(affs_mod_CFLAGS) -E $<          | sh $(srcdir)/genfslist.sh 
affs > $@ || (rm -f $@; exit 1)
 
 partmap-affs_mod-fs_affs.lst: fs/affs.c $(fs/affs.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(affs_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh affs > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(affs_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genpartmaplist.sh affs > $@ || (rm -f $@; exit 1)
 
 
 affs_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1336,13 +1336,13 @@
 PARTMAPFILES += partmap-sfs_mod-fs_sfs.lst
 
 cmd-sfs_mod-fs_sfs.lst: fs/sfs.c $(fs/sfs.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(sfs_mod_CFLAGS) -E $<    | sh $(srcdir)/gencmdlist.sh sfs > 
$@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(sfs_mod_CFLAGS) -E $<           | sh $(srcdir)/gencmdlist.sh 
sfs > $@ || (rm -f $@; exit 1)
 
 fs-sfs_mod-fs_sfs.lst: fs/sfs.c $(fs/sfs.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(sfs_mod_CFLAGS) -E $<    | sh $(srcdir)/genfslist.sh sfs > 
$@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(sfs_mod_CFLAGS) -E $<           | sh $(srcdir)/genfslist.sh 
sfs > $@ || (rm -f $@; exit 1)
 
 partmap-sfs_mod-fs_sfs.lst: fs/sfs.c $(fs/sfs.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(sfs_mod_CFLAGS) -E $<    | sh $(srcdir)/genpartmaplist.sh 
sfs > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(sfs_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh sfs > $@ || (rm -f $@; exit 1)
 
 
 sfs_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1393,13 +1393,13 @@
 PARTMAPFILES += partmap-hfsplus_mod-fs_hfsplus.lst
 
 cmd-hfsplus_mod-fs_hfsplus.lst: fs/hfsplus.c $(fs/hfsplus.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(hfsplus_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh hfsplus > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(hfsplus_mod_CFLAGS) -E $<       | sh $(srcdir)/gencmdlist.sh 
hfsplus > $@ || (rm -f $@; exit 1)
 
 fs-hfsplus_mod-fs_hfsplus.lst: fs/hfsplus.c $(fs/hfsplus.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(hfsplus_mod_CFLAGS) -E $<        | sh $(srcdir)/genfslist.sh 
hfsplus > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(hfsplus_mod_CFLAGS) -E $<       | sh $(srcdir)/genfslist.sh 
hfsplus > $@ || (rm -f $@; exit 1)
 
 partmap-hfsplus_mod-fs_hfsplus.lst: fs/hfsplus.c $(fs/hfsplus.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(hfsplus_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh hfsplus > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(hfsplus_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genpartmaplist.sh hfsplus > $@ || (rm -f $@; exit 1)
 
 
 hfsplus_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1450,13 +1450,13 @@
 PARTMAPFILES += partmap-reiserfs_mod-fs_reiserfs.lst
 
 cmd-reiserfs_mod-fs_reiserfs.lst: fs/reiserfs.c $(fs/reiserfs.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(reiserfs_mod_CFLAGS) -E $<       | sh 
$(srcdir)/gencmdlist.sh reiserfs > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(reiserfs_mod_CFLAGS) -E $<      | sh $(srcdir)/gencmdlist.sh 
reiserfs > $@ || (rm -f $@; exit 1)
 
 fs-reiserfs_mod-fs_reiserfs.lst: fs/reiserfs.c $(fs/reiserfs.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(reiserfs_mod_CFLAGS) -E $<       | sh $(srcdir)/genfslist.sh 
reiserfs > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(reiserfs_mod_CFLAGS) -E $<      | sh $(srcdir)/genfslist.sh 
reiserfs > $@ || (rm -f $@; exit 1)
 
 partmap-reiserfs_mod-fs_reiserfs.lst: fs/reiserfs.c 
$(fs/reiserfs.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(reiserfs_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genpartmaplist.sh reiserfs > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(reiserfs_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genpartmaplist.sh reiserfs > $@ || (rm -f $@; exit 1)
 
 
 reiserfs_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1507,13 +1507,13 @@
 PARTMAPFILES += partmap-cpio_mod-fs_cpio.lst
 
 cmd-cpio_mod-fs_cpio.lst: fs/cpio.c $(fs/cpio.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(cpio_mod_CFLAGS) -E $<           | sh 
$(srcdir)/gencmdlist.sh cpio > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(cpio_mod_CFLAGS) -E $<          | sh $(srcdir)/gencmdlist.sh 
cpio > $@ || (rm -f $@; exit 1)
 
 fs-cpio_mod-fs_cpio.lst: fs/cpio.c $(fs/cpio.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(cpio_mod_CFLAGS) -E $<           | sh $(srcdir)/genfslist.sh 
cpio > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(cpio_mod_CFLAGS) -E $<          | sh $(srcdir)/genfslist.sh 
cpio > $@ || (rm -f $@; exit 1)
 
 partmap-cpio_mod-fs_cpio.lst: fs/cpio.c $(fs/cpio.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(cpio_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh cpio > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(cpio_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genpartmaplist.sh cpio > $@ || (rm -f $@; exit 1)
 
 
 cpio_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1564,13 +1564,13 @@
 PARTMAPFILES += partmap-tar_mod-fs_cpio.lst
 
 cmd-tar_mod-fs_cpio.lst: fs/cpio.c $(fs/cpio.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(tar_mod_CFLAGS) -E $<    | sh $(srcdir)/gencmdlist.sh tar > 
$@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(tar_mod_CFLAGS) -E $<           | sh $(srcdir)/gencmdlist.sh 
tar > $@ || (rm -f $@; exit 1)
 
 fs-tar_mod-fs_cpio.lst: fs/cpio.c $(fs/cpio.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(tar_mod_CFLAGS) -E $<    | sh $(srcdir)/genfslist.sh tar > 
$@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(tar_mod_CFLAGS) -E $<           | sh $(srcdir)/genfslist.sh 
tar > $@ || (rm -f $@; exit 1)
 
 partmap-tar_mod-fs_cpio.lst: fs/cpio.c $(fs/cpio.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(tar_mod_CFLAGS) -E $<    | sh $(srcdir)/genpartmaplist.sh 
tar > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(tar_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh tar > $@ || (rm -f $@; exit 1)
 
 
 tar_mod_CFLAGS = $(COMMON_CFLAGS) -DMODE_USTAR
@@ -1621,13 +1621,13 @@
 PARTMAPFILES += partmap-udf_mod-fs_udf.lst
 
 cmd-udf_mod-fs_udf.lst: fs/udf.c $(fs/udf.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(udf_mod_CFLAGS) -E $<    | sh $(srcdir)/gencmdlist.sh udf > 
$@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(udf_mod_CFLAGS) -E $<           | sh $(srcdir)/gencmdlist.sh 
udf > $@ || (rm -f $@; exit 1)
 
 fs-udf_mod-fs_udf.lst: fs/udf.c $(fs/udf.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(udf_mod_CFLAGS) -E $<    | sh $(srcdir)/genfslist.sh udf > 
$@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(udf_mod_CFLAGS) -E $<           | sh $(srcdir)/genfslist.sh 
udf > $@ || (rm -f $@; exit 1)
 
 partmap-udf_mod-fs_udf.lst: fs/udf.c $(fs/udf.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(udf_mod_CFLAGS) -E $<    | sh $(srcdir)/genpartmaplist.sh 
udf > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(udf_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh udf > $@ || (rm -f $@; exit 1)
 
 
 udf_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1678,13 +1678,13 @@
 PARTMAPFILES += partmap-afs_mod-fs_afs.lst
 
 cmd-afs_mod-fs_afs.lst: fs/afs.c $(fs/afs.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(afs_mod_CFLAGS) -E $<    | sh $(srcdir)/gencmdlist.sh afs > 
$@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(afs_mod_CFLAGS) -E $<           | sh $(srcdir)/gencmdlist.sh 
afs > $@ || (rm -f $@; exit 1)
 
 fs-afs_mod-fs_afs.lst: fs/afs.c $(fs/afs.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(afs_mod_CFLAGS) -E $<    | sh $(srcdir)/genfslist.sh afs > 
$@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(afs_mod_CFLAGS) -E $<           | sh $(srcdir)/genfslist.sh 
afs > $@ || (rm -f $@; exit 1)
 
 partmap-afs_mod-fs_afs.lst: fs/afs.c $(fs/afs.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(afs_mod_CFLAGS) -E $<    | sh $(srcdir)/genpartmaplist.sh 
afs > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifs -I$(srcdir)/fs $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(afs_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh afs > $@ || (rm -f $@; exit 1)
 
 
 afs_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1738,13 +1738,13 @@
 PARTMAPFILES += partmap-amiga_mod-partmap_amiga.lst
 
 cmd-amiga_mod-partmap_amiga.lst: partmap/amiga.c 
$(partmap/amiga.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(amiga_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh amiga > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(amiga_mod_CFLAGS) -E $<       | sh 
$(srcdir)/gencmdlist.sh amiga > $@ || (rm -f $@; exit 1)
 
 fs-amiga_mod-partmap_amiga.lst: partmap/amiga.c 
$(partmap/amiga.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(amiga_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh amiga > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(amiga_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genfslist.sh amiga > $@ || (rm -f $@; exit 1)
 
 partmap-amiga_mod-partmap_amiga.lst: partmap/amiga.c 
$(partmap/amiga.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(amiga_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh amiga > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(amiga_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genpartmaplist.sh amiga > $@ || (rm -f $@; exit 1)
 
 
 amiga_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1795,13 +1795,13 @@
 PARTMAPFILES += partmap-apple_mod-partmap_apple.lst
 
 cmd-apple_mod-partmap_apple.lst: partmap/apple.c 
$(partmap/apple.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(apple_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh apple > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(apple_mod_CFLAGS) -E $<       | sh 
$(srcdir)/gencmdlist.sh apple > $@ || (rm -f $@; exit 1)
 
 fs-apple_mod-partmap_apple.lst: partmap/apple.c 
$(partmap/apple.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(apple_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh apple > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(apple_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genfslist.sh apple > $@ || (rm -f $@; exit 1)
 
 partmap-apple_mod-partmap_apple.lst: partmap/apple.c 
$(partmap/apple.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(apple_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh apple > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(apple_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genpartmaplist.sh apple > $@ || (rm -f $@; exit 1)
 
 
 apple_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1852,13 +1852,13 @@
 PARTMAPFILES += partmap-pc_mod-partmap_pc.lst
 
 cmd-pc_mod-partmap_pc.lst: partmap/pc.c $(partmap/pc.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(pc_mod_CFLAGS) -E $<           | sh 
$(srcdir)/gencmdlist.sh pc > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(pc_mod_CFLAGS) -E $<          | sh 
$(srcdir)/gencmdlist.sh pc > $@ || (rm -f $@; exit 1)
 
 fs-pc_mod-partmap_pc.lst: partmap/pc.c $(partmap/pc.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(pc_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genfslist.sh pc > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(pc_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genfslist.sh pc > $@ || (rm -f $@; exit 1)
 
 partmap-pc_mod-partmap_pc.lst: partmap/pc.c $(partmap/pc.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(pc_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh pc > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(pc_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genpartmaplist.sh pc > $@ || (rm -f $@; exit 1)
 
 
 pc_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1909,13 +1909,13 @@
 PARTMAPFILES += partmap-sun_mod-partmap_sun.lst
 
 cmd-sun_mod-partmap_sun.lst: partmap/sun.c $(partmap/sun.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(sun_mod_CFLAGS) -E $<          | sh 
$(srcdir)/gencmdlist.sh sun > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(sun_mod_CFLAGS) -E $<         | sh 
$(srcdir)/gencmdlist.sh sun > $@ || (rm -f $@; exit 1)
 
 fs-sun_mod-partmap_sun.lst: partmap/sun.c $(partmap/sun.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(sun_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genfslist.sh sun > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(sun_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genfslist.sh sun > $@ || (rm -f $@; exit 1)
 
 partmap-sun_mod-partmap_sun.lst: partmap/sun.c $(partmap/sun.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(sun_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genpartmaplist.sh sun > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(sun_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genpartmaplist.sh sun > $@ || (rm -f $@; exit 1)
 
 
 sun_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1966,13 +1966,13 @@
 PARTMAPFILES += partmap-acorn_mod-partmap_acorn.lst
 
 cmd-acorn_mod-partmap_acorn.lst: partmap/acorn.c 
$(partmap/acorn.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(acorn_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh acorn > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(acorn_mod_CFLAGS) -E $<       | sh 
$(srcdir)/gencmdlist.sh acorn > $@ || (rm -f $@; exit 1)
 
 fs-acorn_mod-partmap_acorn.lst: partmap/acorn.c 
$(partmap/acorn.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(acorn_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh acorn > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(acorn_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genfslist.sh acorn > $@ || (rm -f $@; exit 1)
 
 partmap-acorn_mod-partmap_acorn.lst: partmap/acorn.c 
$(partmap/acorn.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(acorn_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh acorn > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(acorn_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genpartmaplist.sh acorn > $@ || (rm -f $@; exit 1)
 
 
 acorn_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -2023,13 +2023,13 @@
 PARTMAPFILES += partmap-gpt_mod-partmap_gpt.lst
 
 cmd-gpt_mod-partmap_gpt.lst: partmap/gpt.c $(partmap/gpt.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(gpt_mod_CFLAGS) -E $<          | sh 
$(srcdir)/gencmdlist.sh gpt > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(gpt_mod_CFLAGS) -E $<         | sh 
$(srcdir)/gencmdlist.sh gpt > $@ || (rm -f $@; exit 1)
 
 fs-gpt_mod-partmap_gpt.lst: partmap/gpt.c $(partmap/gpt.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(gpt_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genfslist.sh gpt > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(gpt_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genfslist.sh gpt > $@ || (rm -f $@; exit 1)
 
 partmap-gpt_mod-partmap_gpt.lst: partmap/gpt.c $(partmap/gpt.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(gpt_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genpartmaplist.sh gpt > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ipartmap -I$(srcdir)/partmap 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(gpt_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genpartmaplist.sh gpt > $@ || (rm -f $@; exit 1)
 
 
 gpt_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -2085,13 +2085,13 @@
 PARTMAPFILES += partmap-raid_mod-disk_raid.lst
 
 cmd-raid_mod-disk_raid.lst: disk/raid.c $(disk/raid.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(raid_mod_CFLAGS) -E $<       | sh 
$(srcdir)/gencmdlist.sh raid > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(raid_mod_CFLAGS) -E $<      | sh 
$(srcdir)/gencmdlist.sh raid > $@ || (rm -f $@; exit 1)
 
 fs-raid_mod-disk_raid.lst: disk/raid.c $(disk/raid.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(raid_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genfslist.sh raid > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(raid_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genfslist.sh raid > $@ || (rm -f $@; exit 1)
 
 partmap-raid_mod-disk_raid.lst: disk/raid.c $(disk/raid.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(raid_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genpartmaplist.sh raid > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(raid_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genpartmaplist.sh raid > $@ || (rm -f $@; exit 1)
 
 
 raid_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -2142,13 +2142,13 @@
 PARTMAPFILES += partmap-raid5rec_mod-disk_raid5_recover.lst
 
 cmd-raid5rec_mod-disk_raid5_recover.lst: disk/raid5_recover.c 
$(disk/raid5_recover.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(raid5rec_mod_CFLAGS) -E $<           | sh 
$(srcdir)/gencmdlist.sh raid5rec > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(raid5rec_mod_CFLAGS) -E $<          | sh 
$(srcdir)/gencmdlist.sh raid5rec > $@ || (rm -f $@; exit 1)
 
 fs-raid5rec_mod-disk_raid5_recover.lst: disk/raid5_recover.c 
$(disk/raid5_recover.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(raid5rec_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genfslist.sh raid5rec > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(raid5rec_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genfslist.sh raid5rec > $@ || (rm -f $@; exit 1)
 
 partmap-raid5rec_mod-disk_raid5_recover.lst: disk/raid5_recover.c 
$(disk/raid5_recover.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(raid5rec_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh raid5rec > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(raid5rec_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genpartmaplist.sh raid5rec > $@ || (rm -f $@; exit 1)
 
 
 raid5rec_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -2199,13 +2199,13 @@
 PARTMAPFILES += partmap-raid6rec_mod-disk_raid6_recover.lst
 
 cmd-raid6rec_mod-disk_raid6_recover.lst: disk/raid6_recover.c 
$(disk/raid6_recover.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(raid6rec_mod_CFLAGS) -E $<           | sh 
$(srcdir)/gencmdlist.sh raid6rec > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(raid6rec_mod_CFLAGS) -E $<          | sh 
$(srcdir)/gencmdlist.sh raid6rec > $@ || (rm -f $@; exit 1)
 
 fs-raid6rec_mod-disk_raid6_recover.lst: disk/raid6_recover.c 
$(disk/raid6_recover.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(raid6rec_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genfslist.sh raid6rec > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(raid6rec_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genfslist.sh raid6rec > $@ || (rm -f $@; exit 1)
 
 partmap-raid6rec_mod-disk_raid6_recover.lst: disk/raid6_recover.c 
$(disk/raid6_recover.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(raid6rec_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh raid6rec > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(raid6rec_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genpartmaplist.sh raid6rec > $@ || (rm -f $@; exit 1)
 
 
 raid6rec_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -2256,13 +2256,13 @@
 PARTMAPFILES += partmap-mdraid_mod-disk_mdraid_linux.lst
 
 cmd-mdraid_mod-disk_mdraid_linux.lst: disk/mdraid_linux.c 
$(disk/mdraid_linux.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(mdraid_mod_CFLAGS) -E $<     | sh 
$(srcdir)/gencmdlist.sh mdraid > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(mdraid_mod_CFLAGS) -E $<    | sh 
$(srcdir)/gencmdlist.sh mdraid > $@ || (rm -f $@; exit 1)
 
 fs-mdraid_mod-disk_mdraid_linux.lst: disk/mdraid_linux.c 
$(disk/mdraid_linux.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(mdraid_mod_CFLAGS) -E $<     | sh 
$(srcdir)/genfslist.sh mdraid > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(mdraid_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genfslist.sh mdraid > $@ || (rm -f $@; exit 1)
 
 partmap-mdraid_mod-disk_mdraid_linux.lst: disk/mdraid_linux.c 
$(disk/mdraid_linux.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(mdraid_mod_CFLAGS) -E $<     | sh 
$(srcdir)/genpartmaplist.sh mdraid > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(mdraid_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genpartmaplist.sh mdraid > $@ || (rm -f $@; exit 1)
 
 
 mdraid_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -2313,13 +2313,13 @@
 PARTMAPFILES += partmap-dm_nv_mod-disk_dmraid_nvidia.lst
 
 cmd-dm_nv_mod-disk_dmraid_nvidia.lst: disk/dmraid_nvidia.c 
$(disk/dmraid_nvidia.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(dm_nv_mod_CFLAGS) -E $<      | sh 
$(srcdir)/gencmdlist.sh dm_nv > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(dm_nv_mod_CFLAGS) -E $<     | sh 
$(srcdir)/gencmdlist.sh dm_nv > $@ || (rm -f $@; exit 1)
 
 fs-dm_nv_mod-disk_dmraid_nvidia.lst: disk/dmraid_nvidia.c 
$(disk/dmraid_nvidia.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(dm_nv_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genfslist.sh dm_nv > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(dm_nv_mod_CFLAGS) -E $<     | sh 
$(srcdir)/genfslist.sh dm_nv > $@ || (rm -f $@; exit 1)
 
 partmap-dm_nv_mod-disk_dmraid_nvidia.lst: disk/dmraid_nvidia.c 
$(disk/dmraid_nvidia.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(dm_nv_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genpartmaplist.sh dm_nv > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(dm_nv_mod_CFLAGS) -E $<     | sh 
$(srcdir)/genpartmaplist.sh dm_nv > $@ || (rm -f $@; exit 1)
 
 
 dm_nv_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -2370,13 +2370,13 @@
 PARTMAPFILES += partmap-lvm_mod-disk_lvm.lst
 
 cmd-lvm_mod-disk_lvm.lst: disk/lvm.c $(disk/lvm.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(lvm_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh lvm > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(lvm_mod_CFLAGS) -E $<       | sh 
$(srcdir)/gencmdlist.sh lvm > $@ || (rm -f $@; exit 1)
 
 fs-lvm_mod-disk_lvm.lst: disk/lvm.c $(disk/lvm.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(lvm_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh lvm > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(lvm_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genfslist.sh lvm > $@ || (rm -f $@; exit 1)
 
 partmap-lvm_mod-disk_lvm.lst: disk/lvm.c $(disk/lvm.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(lvm_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh lvm > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(lvm_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genpartmaplist.sh lvm > $@ || (rm -f $@; exit 1)
 
 
 lvm_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -2427,13 +2427,13 @@
 PARTMAPFILES += partmap-scsi_mod-disk_scsi.lst
 
 cmd-scsi_mod-disk_scsi.lst: disk/scsi.c $(disk/scsi.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(scsi_mod_CFLAGS) -E $<       | sh 
$(srcdir)/gencmdlist.sh scsi > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(scsi_mod_CFLAGS) -E $<      | sh 
$(srcdir)/gencmdlist.sh scsi > $@ || (rm -f $@; exit 1)
 
 fs-scsi_mod-disk_scsi.lst: disk/scsi.c $(disk/scsi.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(scsi_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genfslist.sh scsi > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(scsi_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genfslist.sh scsi > $@ || (rm -f $@; exit 1)
 
 partmap-scsi_mod-disk_scsi.lst: disk/scsi.c $(disk/scsi.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(scsi_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genpartmaplist.sh scsi > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(scsi_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genpartmaplist.sh scsi > $@ || (rm -f $@; exit 1)
 
 
 scsi_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -2491,13 +2491,13 @@
 PARTMAPFILES += partmap-minicmd_mod-commands_minicmd.lst
 
 cmd-minicmd_mod-commands_minicmd.lst: commands/minicmd.c 
$(commands/minicmd.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(minicmd_mod_CFLAGS) -E $<    | sh 
$(srcdir)/gencmdlist.sh minicmd > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(minicmd_mod_CFLAGS) -E $<           | sh 
$(srcdir)/gencmdlist.sh minicmd > $@ || (rm -f $@; exit 1)
 
 fs-minicmd_mod-commands_minicmd.lst: commands/minicmd.c 
$(commands/minicmd.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(minicmd_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genfslist.sh minicmd > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(minicmd_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genfslist.sh minicmd > $@ || (rm -f $@; exit 1)
 
 partmap-minicmd_mod-commands_minicmd.lst: commands/minicmd.c 
$(commands/minicmd.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(minicmd_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genpartmaplist.sh minicmd > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(minicmd_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh minicmd > $@ || (rm -f $@; exit 1)
 
 
 minicmd_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -2548,13 +2548,13 @@
 PARTMAPFILES += partmap-extcmd_mod-commands_extcmd.lst
 
 cmd-extcmd_mod-commands_extcmd.lst: commands/extcmd.c 
$(commands/extcmd.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(extcmd_mod_CFLAGS) -E $<     | sh 
$(srcdir)/gencmdlist.sh extcmd > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(extcmd_mod_CFLAGS) -E $<    | sh 
$(srcdir)/gencmdlist.sh extcmd > $@ || (rm -f $@; exit 1)
 
 fs-extcmd_mod-commands_extcmd.lst: commands/extcmd.c 
$(commands/extcmd.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(extcmd_mod_CFLAGS) -E $<     | sh 
$(srcdir)/genfslist.sh extcmd > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(extcmd_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genfslist.sh extcmd > $@ || (rm -f $@; exit 1)
 
 partmap-extcmd_mod-commands_extcmd.lst: commands/extcmd.c 
$(commands/extcmd.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(extcmd_mod_CFLAGS) -E $<     | sh 
$(srcdir)/genpartmaplist.sh extcmd > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(extcmd_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genpartmaplist.sh extcmd > $@ || (rm -f $@; exit 1)
 
 
 extcmd_mod-lib_arg.o: lib/arg.c $(lib/arg.c_DEPENDENCIES)
@@ -2567,13 +2567,13 @@
 PARTMAPFILES += partmap-extcmd_mod-lib_arg.lst
 
 cmd-extcmd_mod-lib_arg.lst: lib/arg.c $(lib/arg.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(extcmd_mod_CFLAGS) -E $<       | sh $(srcdir)/gencmdlist.sh 
extcmd > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
 $(TARGET_CFLAGS) $(extcmd_mod_CFLAGS) -E $<      | sh $(srcdir)/gencmdlist.sh 
extcmd > $@ || (rm -f $@; exit 1)
 
 fs-extcmd_mod-lib_arg.lst: lib/arg.c $(lib/arg.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(extcmd_mod_CFLAGS) -E $<       | sh $(srcdir)/genfslist.sh 
extcmd > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
 $(TARGET_CFLAGS) $(extcmd_mod_CFLAGS) -E $<      | sh $(srcdir)/genfslist.sh 
extcmd > $@ || (rm -f $@; exit 1)
 
 partmap-extcmd_mod-lib_arg.lst: lib/arg.c $(lib/arg.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(extcmd_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genpartmaplist.sh extcmd > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
 $(TARGET_CFLAGS) $(extcmd_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genpartmaplist.sh extcmd > $@ || (rm -f $@; exit 1)
 
 
 extcmd_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -2624,13 +2624,13 @@
 PARTMAPFILES += partmap-hello_mod-hello_hello.lst
 
 cmd-hello_mod-hello_hello.lst: hello/hello.c $(hello/hello.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ihello -I$(srcdir)/hello 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(hello_mod_CFLAGS) -E $<    | sh 
$(srcdir)/gencmdlist.sh hello > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ihello -I$(srcdir)/hello 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(hello_mod_CFLAGS) -E $<           | sh 
$(srcdir)/gencmdlist.sh hello > $@ || (rm -f $@; exit 1)
 
 fs-hello_mod-hello_hello.lst: hello/hello.c $(hello/hello.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Ihello -I$(srcdir)/hello 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(hello_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genfslist.sh hello > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ihello -I$(srcdir)/hello 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(hello_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genfslist.sh hello > $@ || (rm -f $@; exit 1)
 
 partmap-hello_mod-hello_hello.lst: hello/hello.c $(hello/hello.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ihello -I$(srcdir)/hello 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(hello_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genpartmaplist.sh hello > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ihello -I$(srcdir)/hello 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(hello_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh hello > $@ || (rm -f $@; exit 1)
 
 
 hello_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -2681,13 +2681,13 @@
 PARTMAPFILES += partmap-handler_mod-commands_handler.lst
 
 cmd-handler_mod-commands_handler.lst: commands/handler.c 
$(commands/handler.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(handler_mod_CFLAGS) -E $<    | sh 
$(srcdir)/gencmdlist.sh handler > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(handler_mod_CFLAGS) -E $<           | sh 
$(srcdir)/gencmdlist.sh handler > $@ || (rm -f $@; exit 1)
 
 fs-handler_mod-commands_handler.lst: commands/handler.c 
$(commands/handler.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(handler_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genfslist.sh handler > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(handler_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genfslist.sh handler > $@ || (rm -f $@; exit 1)
 
 partmap-handler_mod-commands_handler.lst: commands/handler.c 
$(commands/handler.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(handler_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genpartmaplist.sh handler > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(handler_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh handler > $@ || (rm -f $@; exit 1)
 
 
 handler_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -2738,13 +2738,13 @@
 PARTMAPFILES += partmap-ls_mod-commands_ls.lst
 
 cmd-ls_mod-commands_ls.lst: commands/ls.c $(commands/ls.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(ls_mod_CFLAGS) -E $<         | sh 
$(srcdir)/gencmdlist.sh ls > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(ls_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh ls > $@ || (rm -f $@; exit 1)
 
 fs-ls_mod-commands_ls.lst: commands/ls.c $(commands/ls.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(ls_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genfslist.sh ls > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(ls_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh ls > $@ || (rm -f $@; exit 1)
 
 partmap-ls_mod-commands_ls.lst: commands/ls.c $(commands/ls.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(ls_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genpartmaplist.sh ls > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(ls_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh ls > $@ || (rm -f $@; exit 1)
 
 
 ls_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -2795,13 +2795,13 @@
 PARTMAPFILES += partmap-cmp_mod-commands_cmp.lst
 
 cmd-cmp_mod-commands_cmp.lst: commands/cmp.c $(commands/cmp.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(cmp_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh cmp > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(cmp_mod_CFLAGS) -E $<       | sh 
$(srcdir)/gencmdlist.sh cmp > $@ || (rm -f $@; exit 1)
 
 fs-cmp_mod-commands_cmp.lst: commands/cmp.c $(commands/cmp.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(cmp_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh cmp > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(cmp_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genfslist.sh cmp > $@ || (rm -f $@; exit 1)
 
 partmap-cmp_mod-commands_cmp.lst: commands/cmp.c 
$(commands/cmp.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(cmp_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh cmp > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(cmp_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genpartmaplist.sh cmp > $@ || (rm -f $@; exit 1)
 
 
 cmp_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -2852,13 +2852,13 @@
 PARTMAPFILES += partmap-cat_mod-commands_cat.lst
 
 cmd-cat_mod-commands_cat.lst: commands/cat.c $(commands/cat.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(cat_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh cat > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(cat_mod_CFLAGS) -E $<       | sh 
$(srcdir)/gencmdlist.sh cat > $@ || (rm -f $@; exit 1)
 
 fs-cat_mod-commands_cat.lst: commands/cat.c $(commands/cat.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(cat_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh cat > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(cat_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genfslist.sh cat > $@ || (rm -f $@; exit 1)
 
 partmap-cat_mod-commands_cat.lst: commands/cat.c 
$(commands/cat.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(cat_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh cat > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(cat_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genpartmaplist.sh cat > $@ || (rm -f $@; exit 1)
 
 
 cat_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -2909,13 +2909,13 @@
 PARTMAPFILES += partmap-echo_mod-commands_echo.lst
 
 cmd-echo_mod-commands_echo.lst: commands/echo.c 
$(commands/echo.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(echo_mod_CFLAGS) -E $<       | sh 
$(srcdir)/gencmdlist.sh echo > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(echo_mod_CFLAGS) -E $<      | sh 
$(srcdir)/gencmdlist.sh echo > $@ || (rm -f $@; exit 1)
 
 fs-echo_mod-commands_echo.lst: commands/echo.c $(commands/echo.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(echo_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genfslist.sh echo > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(echo_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genfslist.sh echo > $@ || (rm -f $@; exit 1)
 
 partmap-echo_mod-commands_echo.lst: commands/echo.c 
$(commands/echo.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(echo_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genpartmaplist.sh echo > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(echo_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genpartmaplist.sh echo > $@ || (rm -f $@; exit 1)
 
 
 echo_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -2966,13 +2966,13 @@
 PARTMAPFILES += partmap-help_mod-commands_help.lst
 
 cmd-help_mod-commands_help.lst: commands/help.c 
$(commands/help.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(help_mod_CFLAGS) -E $<       | sh 
$(srcdir)/gencmdlist.sh help > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(help_mod_CFLAGS) -E $<      | sh 
$(srcdir)/gencmdlist.sh help > $@ || (rm -f $@; exit 1)
 
 fs-help_mod-commands_help.lst: commands/help.c $(commands/help.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(help_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genfslist.sh help > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(help_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genfslist.sh help > $@ || (rm -f $@; exit 1)
 
 partmap-help_mod-commands_help.lst: commands/help.c 
$(commands/help.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(help_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genpartmaplist.sh help > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(help_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genpartmaplist.sh help > $@ || (rm -f $@; exit 1)
 
 
 help_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -3023,13 +3023,13 @@
 PARTMAPFILES += partmap-search_mod-commands_search.lst
 
 cmd-search_mod-commands_search.lst: commands/search.c 
$(commands/search.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(search_mod_CFLAGS) -E $<     | sh 
$(srcdir)/gencmdlist.sh search > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(search_mod_CFLAGS) -E $<    | sh 
$(srcdir)/gencmdlist.sh search > $@ || (rm -f $@; exit 1)
 
 fs-search_mod-commands_search.lst: commands/search.c 
$(commands/search.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(search_mod_CFLAGS) -E $<     | sh 
$(srcdir)/genfslist.sh search > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(search_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genfslist.sh search > $@ || (rm -f $@; exit 1)
 
 partmap-search_mod-commands_search.lst: commands/search.c 
$(commands/search.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(search_mod_CFLAGS) -E $<     | sh 
$(srcdir)/genpartmaplist.sh search > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(search_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genpartmaplist.sh search > $@ || (rm -f $@; exit 1)
 
 
 search_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -3080,13 +3080,13 @@
 PARTMAPFILES += partmap-test_mod-commands_test.lst
 
 cmd-test_mod-commands_test.lst: commands/test.c 
$(commands/test.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(test_mod_CFLAGS) -E $<       | sh 
$(srcdir)/gencmdlist.sh test > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(test_mod_CFLAGS) -E $<      | sh 
$(srcdir)/gencmdlist.sh test > $@ || (rm -f $@; exit 1)
 
 fs-test_mod-commands_test.lst: commands/test.c $(commands/test.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(test_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genfslist.sh test > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(test_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genfslist.sh test > $@ || (rm -f $@; exit 1)
 
 partmap-test_mod-commands_test.lst: commands/test.c 
$(commands/test.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(test_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genpartmaplist.sh test > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(test_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genpartmaplist.sh test > $@ || (rm -f $@; exit 1)
 
 
 test_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -3137,13 +3137,13 @@
 PARTMAPFILES += partmap-loopback_mod-disk_loopback.lst
 
 cmd-loopback_mod-disk_loopback.lst: disk/loopback.c 
$(disk/loopback.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(loopback_mod_CFLAGS) -E $<           | sh 
$(srcdir)/gencmdlist.sh loopback > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(loopback_mod_CFLAGS) -E $<          | sh 
$(srcdir)/gencmdlist.sh loopback > $@ || (rm -f $@; exit 1)
 
 fs-loopback_mod-disk_loopback.lst: disk/loopback.c 
$(disk/loopback.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(loopback_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genfslist.sh loopback > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(loopback_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genfslist.sh loopback > $@ || (rm -f $@; exit 1)
 
 partmap-loopback_mod-disk_loopback.lst: disk/loopback.c 
$(disk/loopback.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(loopback_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh loopback > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(loopback_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genpartmaplist.sh loopback > $@ || (rm -f $@; exit 1)
 
 
 loopback_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -3194,13 +3194,13 @@
 PARTMAPFILES += partmap-fs_uuid_mod-disk_fs_uuid.lst
 
 cmd-fs_uuid_mod-disk_fs_uuid.lst: disk/fs_uuid.c 
$(disk/fs_uuid.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(fs_uuid_mod_CFLAGS) -E $<    | sh 
$(srcdir)/gencmdlist.sh fs_uuid > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(fs_uuid_mod_CFLAGS) -E $<           | sh 
$(srcdir)/gencmdlist.sh fs_uuid > $@ || (rm -f $@; exit 1)
 
 fs-fs_uuid_mod-disk_fs_uuid.lst: disk/fs_uuid.c $(disk/fs_uuid.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(fs_uuid_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genfslist.sh fs_uuid > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(fs_uuid_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genfslist.sh fs_uuid > $@ || (rm -f $@; exit 1)
 
 partmap-fs_uuid_mod-disk_fs_uuid.lst: disk/fs_uuid.c 
$(disk/fs_uuid.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(fs_uuid_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genpartmaplist.sh fs_uuid > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(fs_uuid_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh fs_uuid > $@ || (rm -f $@; exit 1)
 
 
 fs_uuid_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -3251,13 +3251,13 @@
 PARTMAPFILES += partmap-configfile_mod-commands_configfile.lst
 
 cmd-configfile_mod-commands_configfile.lst: commands/configfile.c 
$(commands/configfile.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(configfile_mod_CFLAGS) -E $<         | sh 
$(srcdir)/gencmdlist.sh configfile > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(configfile_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh configfile > $@ || (rm -f $@; exit 1)
 
 fs-configfile_mod-commands_configfile.lst: commands/configfile.c 
$(commands/configfile.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(configfile_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genfslist.sh configfile > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(configfile_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh configfile > $@ || (rm -f $@; exit 1)
 
 partmap-configfile_mod-commands_configfile.lst: commands/configfile.c 
$(commands/configfile.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(configfile_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genpartmaplist.sh configfile > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(configfile_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh configfile > $@ || (rm -f $@; exit 1)
 
 
 configfile_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -3308,13 +3308,13 @@
 PARTMAPFILES += partmap-terminfo_mod-term_terminfo.lst
 
 cmd-terminfo_mod-term_terminfo.lst: term/terminfo.c 
$(term/terminfo.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Iterm -I$(srcdir)/term 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(terminfo_mod_CFLAGS) -E $<           | sh 
$(srcdir)/gencmdlist.sh terminfo > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iterm -I$(srcdir)/term 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(terminfo_mod_CFLAGS) -E $<          | sh 
$(srcdir)/gencmdlist.sh terminfo > $@ || (rm -f $@; exit 1)
 
 fs-terminfo_mod-term_terminfo.lst: term/terminfo.c 
$(term/terminfo.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Iterm -I$(srcdir)/term 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(terminfo_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genfslist.sh terminfo > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iterm -I$(srcdir)/term 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(terminfo_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genfslist.sh terminfo > $@ || (rm -f $@; exit 1)
 
 partmap-terminfo_mod-term_terminfo.lst: term/terminfo.c 
$(term/terminfo.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Iterm -I$(srcdir)/term 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(terminfo_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh terminfo > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iterm -I$(srcdir)/term 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(terminfo_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genpartmaplist.sh terminfo > $@ || (rm -f $@; exit 1)
 
 
 terminfo_mod-term_tparm.o: term/tparm.c $(term/tparm.c_DEPENDENCIES)
@@ -3327,13 +3327,13 @@
 PARTMAPFILES += partmap-terminfo_mod-term_tparm.lst
 
 cmd-terminfo_mod-term_tparm.lst: term/tparm.c $(term/tparm.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Iterm -I$(srcdir)/term 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(terminfo_mod_CFLAGS) -E $<           | sh 
$(srcdir)/gencmdlist.sh terminfo > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iterm -I$(srcdir)/term 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(terminfo_mod_CFLAGS) -E $<          | sh 
$(srcdir)/gencmdlist.sh terminfo > $@ || (rm -f $@; exit 1)
 
 fs-terminfo_mod-term_tparm.lst: term/tparm.c $(term/tparm.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Iterm -I$(srcdir)/term 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(terminfo_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genfslist.sh terminfo > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iterm -I$(srcdir)/term 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(terminfo_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genfslist.sh terminfo > $@ || (rm -f $@; exit 1)
 
 partmap-terminfo_mod-term_tparm.lst: term/tparm.c $(term/tparm.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Iterm -I$(srcdir)/term 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(terminfo_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh terminfo > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iterm -I$(srcdir)/term 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(terminfo_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genpartmaplist.sh terminfo > $@ || (rm -f $@; exit 1)
 
 
 terminfo_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -3384,13 +3384,13 @@
 PARTMAPFILES += partmap-blocklist_mod-commands_blocklist.lst
 
 cmd-blocklist_mod-commands_blocklist.lst: commands/blocklist.c 
$(commands/blocklist.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(blocklist_mod_CFLAGS) -E $<          | sh 
$(srcdir)/gencmdlist.sh blocklist > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(blocklist_mod_CFLAGS) -E $<         | sh 
$(srcdir)/gencmdlist.sh blocklist > $@ || (rm -f $@; exit 1)
 
 fs-blocklist_mod-commands_blocklist.lst: commands/blocklist.c 
$(commands/blocklist.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(blocklist_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genfslist.sh blocklist > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(blocklist_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genfslist.sh blocklist > $@ || (rm -f $@; exit 1)
 
 partmap-blocklist_mod-commands_blocklist.lst: commands/blocklist.c 
$(commands/blocklist.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(blocklist_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genpartmaplist.sh blocklist > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(blocklist_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genpartmaplist.sh blocklist > $@ || (rm -f $@; exit 1)
 
 
 blocklist_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -3441,13 +3441,13 @@
 PARTMAPFILES += partmap-hexdump_mod-commands_hexdump.lst
 
 cmd-hexdump_mod-commands_hexdump.lst: commands/hexdump.c 
$(commands/hexdump.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(hexdump_mod_CFLAGS) -E $<    | sh 
$(srcdir)/gencmdlist.sh hexdump > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(hexdump_mod_CFLAGS) -E $<           | sh 
$(srcdir)/gencmdlist.sh hexdump > $@ || (rm -f $@; exit 1)
 
 fs-hexdump_mod-commands_hexdump.lst: commands/hexdump.c 
$(commands/hexdump.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(hexdump_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genfslist.sh hexdump > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(hexdump_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genfslist.sh hexdump > $@ || (rm -f $@; exit 1)
 
 partmap-hexdump_mod-commands_hexdump.lst: commands/hexdump.c 
$(commands/hexdump.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(hexdump_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genpartmaplist.sh hexdump > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(hexdump_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh hexdump > $@ || (rm -f $@; exit 1)
 
 
 hexdump_mod-lib_hexdump.o: lib/hexdump.c $(lib/hexdump.c_DEPENDENCIES)
@@ -3460,13 +3460,13 @@
 PARTMAPFILES += partmap-hexdump_mod-lib_hexdump.lst
 
 cmd-hexdump_mod-lib_hexdump.lst: lib/hexdump.c $(lib/hexdump.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(hexdump_mod_CFLAGS) -E $<      | sh $(srcdir)/gencmdlist.sh 
hexdump > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
 $(TARGET_CFLAGS) $(hexdump_mod_CFLAGS) -E $<     | sh $(srcdir)/gencmdlist.sh 
hexdump > $@ || (rm -f $@; exit 1)
 
 fs-hexdump_mod-lib_hexdump.lst: lib/hexdump.c $(lib/hexdump.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(hexdump_mod_CFLAGS) -E $<      | sh $(srcdir)/genfslist.sh 
hexdump > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
 $(TARGET_CFLAGS) $(hexdump_mod_CFLAGS) -E $<     | sh $(srcdir)/genfslist.sh 
hexdump > $@ || (rm -f $@; exit 1)
 
 partmap-hexdump_mod-lib_hexdump.lst: lib/hexdump.c 
$(lib/hexdump.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(hexdump_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genpartmaplist.sh hexdump > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
 $(TARGET_CFLAGS) $(hexdump_mod_CFLAGS) -E $<     | sh 
$(srcdir)/genpartmaplist.sh hexdump > $@ || (rm -f $@; exit 1)
 
 
 hexdump_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -3517,13 +3517,13 @@
 PARTMAPFILES += partmap-read_mod-commands_read.lst
 
 cmd-read_mod-commands_read.lst: commands/read.c 
$(commands/read.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(read_mod_CFLAGS) -E $<       | sh 
$(srcdir)/gencmdlist.sh read > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(read_mod_CFLAGS) -E $<      | sh 
$(srcdir)/gencmdlist.sh read > $@ || (rm -f $@; exit 1)
 
 fs-read_mod-commands_read.lst: commands/read.c $(commands/read.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(read_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genfslist.sh read > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(read_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genfslist.sh read > $@ || (rm -f $@; exit 1)
 
 partmap-read_mod-commands_read.lst: commands/read.c 
$(commands/read.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(read_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genpartmaplist.sh read > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(read_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genpartmaplist.sh read > $@ || (rm -f $@; exit 1)
 
 
 read_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -3574,13 +3574,13 @@
 PARTMAPFILES += partmap-sleep_mod-commands_sleep.lst
 
 cmd-sleep_mod-commands_sleep.lst: commands/sleep.c 
$(commands/sleep.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(sleep_mod_CFLAGS) -E $<      | sh 
$(srcdir)/gencmdlist.sh sleep > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(sleep_mod_CFLAGS) -E $<     | sh 
$(srcdir)/gencmdlist.sh sleep > $@ || (rm -f $@; exit 1)
 
 fs-sleep_mod-commands_sleep.lst: commands/sleep.c 
$(commands/sleep.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(sleep_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genfslist.sh sleep > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(sleep_mod_CFLAGS) -E $<     | sh 
$(srcdir)/genfslist.sh sleep > $@ || (rm -f $@; exit 1)
 
 partmap-sleep_mod-commands_sleep.lst: commands/sleep.c 
$(commands/sleep.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(sleep_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genpartmaplist.sh sleep > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(sleep_mod_CFLAGS) -E $<     | sh 
$(srcdir)/genpartmaplist.sh sleep > $@ || (rm -f $@; exit 1)
 
 
 sleep_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -3631,13 +3631,13 @@
 PARTMAPFILES += partmap-loadenv_mod-commands_loadenv.lst
 
 cmd-loadenv_mod-commands_loadenv.lst: commands/loadenv.c 
$(commands/loadenv.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(loadenv_mod_CFLAGS) -E $<    | sh 
$(srcdir)/gencmdlist.sh loadenv > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(loadenv_mod_CFLAGS) -E $<           | sh 
$(srcdir)/gencmdlist.sh loadenv > $@ || (rm -f $@; exit 1)
 
 fs-loadenv_mod-commands_loadenv.lst: commands/loadenv.c 
$(commands/loadenv.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(loadenv_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genfslist.sh loadenv > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(loadenv_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genfslist.sh loadenv > $@ || (rm -f $@; exit 1)
 
 partmap-loadenv_mod-commands_loadenv.lst: commands/loadenv.c 
$(commands/loadenv.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(loadenv_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genpartmaplist.sh loadenv > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(loadenv_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh loadenv > $@ || (rm -f $@; exit 1)
 
 
 loadenv_mod-lib_envblk.o: lib/envblk.c $(lib/envblk.c_DEPENDENCIES)
@@ -3650,13 +3650,13 @@
 PARTMAPFILES += partmap-loadenv_mod-lib_envblk.lst
 
 cmd-loadenv_mod-lib_envblk.lst: lib/envblk.c $(lib/envblk.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(loadenv_mod_CFLAGS) -E $<      | sh $(srcdir)/gencmdlist.sh 
loadenv > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
 $(TARGET_CFLAGS) $(loadenv_mod_CFLAGS) -E $<     | sh $(srcdir)/gencmdlist.sh 
loadenv > $@ || (rm -f $@; exit 1)
 
 fs-loadenv_mod-lib_envblk.lst: lib/envblk.c $(lib/envblk.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(loadenv_mod_CFLAGS) -E $<      | sh $(srcdir)/genfslist.sh 
loadenv > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
 $(TARGET_CFLAGS) $(loadenv_mod_CFLAGS) -E $<     | sh $(srcdir)/genfslist.sh 
loadenv > $@ || (rm -f $@; exit 1)
 
 partmap-loadenv_mod-lib_envblk.lst: lib/envblk.c $(lib/envblk.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(loadenv_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genpartmaplist.sh loadenv > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
 $(TARGET_CFLAGS) $(loadenv_mod_CFLAGS) -E $<     | sh 
$(srcdir)/genpartmaplist.sh loadenv > $@ || (rm -f $@; exit 1)
 
 
 loadenv_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -3707,13 +3707,13 @@
 PARTMAPFILES += partmap-crc_mod-commands_crc.lst
 
 cmd-crc_mod-commands_crc.lst: commands/crc.c $(commands/crc.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(crc_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh crc > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(crc_mod_CFLAGS) -E $<       | sh 
$(srcdir)/gencmdlist.sh crc > $@ || (rm -f $@; exit 1)
 
 fs-crc_mod-commands_crc.lst: commands/crc.c $(commands/crc.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(crc_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh crc > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(crc_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genfslist.sh crc > $@ || (rm -f $@; exit 1)
 
 partmap-crc_mod-commands_crc.lst: commands/crc.c 
$(commands/crc.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(crc_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh crc > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(crc_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genpartmaplist.sh crc > $@ || (rm -f $@; exit 1)
 
 
 crc_mod-lib_crc.o: lib/crc.c $(lib/crc.c_DEPENDENCIES)
@@ -3726,13 +3726,13 @@
 PARTMAPFILES += partmap-crc_mod-lib_crc.lst
 
 cmd-crc_mod-lib_crc.lst: lib/crc.c $(lib/crc.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(crc_mod_CFLAGS) -E $<          | sh $(srcdir)/gencmdlist.sh 
crc > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
 $(TARGET_CFLAGS) $(crc_mod_CFLAGS) -E $<         | sh $(srcdir)/gencmdlist.sh 
crc > $@ || (rm -f $@; exit 1)
 
 fs-crc_mod-lib_crc.lst: lib/crc.c $(lib/crc.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(crc_mod_CFLAGS) -E $<          | sh $(srcdir)/genfslist.sh 
crc > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
 $(TARGET_CFLAGS) $(crc_mod_CFLAGS) -E $<         | sh $(srcdir)/genfslist.sh 
crc > $@ || (rm -f $@; exit 1)
 
 partmap-crc_mod-lib_crc.lst: lib/crc.c $(lib/crc.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(crc_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genpartmaplist.sh crc > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ilib -I$(srcdir)/lib $(TARGET_CPPFLAGS) 
 $(TARGET_CFLAGS) $(crc_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genpartmaplist.sh crc > $@ || (rm -f $@; exit 1)
 
 
 crc_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -3787,13 +3787,13 @@
 PARTMAPFILES += partmap-video_mod-video_video.lst
 
 cmd-video_mod-video_video.lst: video/video.c $(video/video.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ivideo -I$(srcdir)/video 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(video_mod_CFLAGS) -E $<    | sh 
$(srcdir)/gencmdlist.sh video > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ivideo -I$(srcdir)/video 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(video_mod_CFLAGS) -E $<           | sh 
$(srcdir)/gencmdlist.sh video > $@ || (rm -f $@; exit 1)
 
 fs-video_mod-video_video.lst: video/video.c $(video/video.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Ivideo -I$(srcdir)/video 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(video_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genfslist.sh video > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ivideo -I$(srcdir)/video 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(video_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genfslist.sh video > $@ || (rm -f $@; exit 1)
 
 partmap-video_mod-video_video.lst: video/video.c $(video/video.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ivideo -I$(srcdir)/video 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(video_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genpartmaplist.sh video > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ivideo -I$(srcdir)/video 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(video_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh video > $@ || (rm -f $@; exit 1)
 
 
 video_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -3844,13 +3844,13 @@
 PARTMAPFILES += partmap-videotest_mod-commands_videotest.lst
 
 cmd-videotest_mod-commands_videotest.lst: commands/videotest.c 
$(commands/videotest.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(videotest_mod_CFLAGS) -E $<          | sh 
$(srcdir)/gencmdlist.sh videotest > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(videotest_mod_CFLAGS) -E $<         | sh 
$(srcdir)/gencmdlist.sh videotest > $@ || (rm -f $@; exit 1)
 
 fs-videotest_mod-commands_videotest.lst: commands/videotest.c 
$(commands/videotest.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(videotest_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genfslist.sh videotest > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(videotest_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genfslist.sh videotest > $@ || (rm -f $@; exit 1)
 
 partmap-videotest_mod-commands_videotest.lst: commands/videotest.c 
$(commands/videotest.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(videotest_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genpartmaplist.sh videotest > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(videotest_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genpartmaplist.sh videotest > $@ || (rm -f $@; exit 1)
 
 
 videotest_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -3901,13 +3901,13 @@
 PARTMAPFILES += partmap-bitmap_mod-video_bitmap.lst
 
 cmd-bitmap_mod-video_bitmap.lst: video/bitmap.c $(video/bitmap.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ivideo -I$(srcdir)/video 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(bitmap_mod_CFLAGS) -E $<           | sh 
$(srcdir)/gencmdlist.sh bitmap > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ivideo -I$(srcdir)/video 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(bitmap_mod_CFLAGS) -E $<          | sh 
$(srcdir)/gencmdlist.sh bitmap > $@ || (rm -f $@; exit 1)
 
 fs-bitmap_mod-video_bitmap.lst: video/bitmap.c $(video/bitmap.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Ivideo -I$(srcdir)/video 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(bitmap_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genfslist.sh bitmap > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ivideo -I$(srcdir)/video 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(bitmap_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genfslist.sh bitmap > $@ || (rm -f $@; exit 1)
 
 partmap-bitmap_mod-video_bitmap.lst: video/bitmap.c 
$(video/bitmap.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ivideo -I$(srcdir)/video 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(bitmap_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh bitmap > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ivideo -I$(srcdir)/video 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(bitmap_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genpartmaplist.sh bitmap > $@ || (rm -f $@; exit 1)
 
 
 bitmap_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -3958,13 +3958,13 @@
 PARTMAPFILES += partmap-tga_mod-video_readers_tga.lst
 
 cmd-tga_mod-video_readers_tga.lst: video/readers/tga.c 
$(video/readers/tga.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ivideo/readers 
-I$(srcdir)/video/readers $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(tga_mod_CFLAGS) 
-E $<      | sh $(srcdir)/gencmdlist.sh tga > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ivideo/readers 
-I$(srcdir)/video/readers $(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) 
$(tga_mod_CFLAGS) -E $<     | sh $(srcdir)/gencmdlist.sh tga > $@ || (rm -f $@; 
exit 1)
 
 fs-tga_mod-video_readers_tga.lst: video/readers/tga.c 
$(video/readers/tga.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ivideo/readers 
-I$(srcdir)/video/readers $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(tga_mod_CFLAGS) 
-E $<      | sh $(srcdir)/genfslist.sh tga > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ivideo/readers 
-I$(srcdir)/video/readers $(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) 
$(tga_mod_CFLAGS) -E $<     | sh $(srcdir)/genfslist.sh tga > $@ || (rm -f $@; 
exit 1)
 
 partmap-tga_mod-video_readers_tga.lst: video/readers/tga.c 
$(video/readers/tga.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ivideo/readers 
-I$(srcdir)/video/readers $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(tga_mod_CFLAGS) 
-E $<      | sh $(srcdir)/genpartmaplist.sh tga > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ivideo/readers 
-I$(srcdir)/video/readers $(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) 
$(tga_mod_CFLAGS) -E $<     | sh $(srcdir)/genpartmaplist.sh tga > $@ || (rm -f 
$@; exit 1)
 
 
 tga_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -4015,13 +4015,13 @@
 PARTMAPFILES += partmap-jpeg_mod-video_readers_jpeg.lst
 
 cmd-jpeg_mod-video_readers_jpeg.lst: video/readers/jpeg.c 
$(video/readers/jpeg.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ivideo/readers 
-I$(srcdir)/video/readers $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(jpeg_mod_CFLAGS) -E $<     | sh $(srcdir)/gencmdlist.sh jpeg > $@ || (rm -f 
$@; exit 1)
+       set -e;           $(TARGET_CC) -Ivideo/readers 
-I$(srcdir)/video/readers $(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) 
$(jpeg_mod_CFLAGS) -E $<    | sh $(srcdir)/gencmdlist.sh jpeg > $@ || (rm -f 
$@; exit 1)
 
 fs-jpeg_mod-video_readers_jpeg.lst: video/readers/jpeg.c 
$(video/readers/jpeg.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ivideo/readers 
-I$(srcdir)/video/readers $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(jpeg_mod_CFLAGS) -E $<     | sh $(srcdir)/genfslist.sh jpeg > $@ || (rm -f 
$@; exit 1)
+       set -e;           $(TARGET_CC) -Ivideo/readers 
-I$(srcdir)/video/readers $(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) 
$(jpeg_mod_CFLAGS) -E $<    | sh $(srcdir)/genfslist.sh jpeg > $@ || (rm -f $@; 
exit 1)
 
 partmap-jpeg_mod-video_readers_jpeg.lst: video/readers/jpeg.c 
$(video/readers/jpeg.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ivideo/readers 
-I$(srcdir)/video/readers $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(jpeg_mod_CFLAGS) -E $<     | sh $(srcdir)/genpartmaplist.sh jpeg > $@ || (rm 
-f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ivideo/readers 
-I$(srcdir)/video/readers $(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) 
$(jpeg_mod_CFLAGS) -E $<    | sh $(srcdir)/genpartmaplist.sh jpeg > $@ || (rm 
-f $@; exit 1)
 
 
 jpeg_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -4072,13 +4072,13 @@
 PARTMAPFILES += partmap-png_mod-video_readers_png.lst
 
 cmd-png_mod-video_readers_png.lst: video/readers/png.c 
$(video/readers/png.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ivideo/readers 
-I$(srcdir)/video/readers $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(png_mod_CFLAGS) 
-E $<      | sh $(srcdir)/gencmdlist.sh png > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ivideo/readers 
-I$(srcdir)/video/readers $(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) 
$(png_mod_CFLAGS) -E $<     | sh $(srcdir)/gencmdlist.sh png > $@ || (rm -f $@; 
exit 1)
 
 fs-png_mod-video_readers_png.lst: video/readers/png.c 
$(video/readers/png.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ivideo/readers 
-I$(srcdir)/video/readers $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(png_mod_CFLAGS) 
-E $<      | sh $(srcdir)/genfslist.sh png > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ivideo/readers 
-I$(srcdir)/video/readers $(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) 
$(png_mod_CFLAGS) -E $<     | sh $(srcdir)/genfslist.sh png > $@ || (rm -f $@; 
exit 1)
 
 partmap-png_mod-video_readers_png.lst: video/readers/png.c 
$(video/readers/png.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ivideo/readers 
-I$(srcdir)/video/readers $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(png_mod_CFLAGS) 
-E $<      | sh $(srcdir)/genpartmaplist.sh png > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ivideo/readers 
-I$(srcdir)/video/readers $(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) 
$(png_mod_CFLAGS) -E $<     | sh $(srcdir)/genpartmaplist.sh png > $@ || (rm -f 
$@; exit 1)
 
 
 png_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -4129,13 +4129,13 @@
 PARTMAPFILES += partmap-font_mod-font_font_cmd.lst
 
 cmd-font_mod-font_font_cmd.lst: font/font_cmd.c 
$(font/font_cmd.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ifont -I$(srcdir)/font 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(font_mod_CFLAGS) -E $<       | sh 
$(srcdir)/gencmdlist.sh font > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifont -I$(srcdir)/font 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(font_mod_CFLAGS) -E $<      | sh 
$(srcdir)/gencmdlist.sh font > $@ || (rm -f $@; exit 1)
 
 fs-font_mod-font_font_cmd.lst: font/font_cmd.c $(font/font_cmd.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Ifont -I$(srcdir)/font 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(font_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genfslist.sh font > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifont -I$(srcdir)/font 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(font_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genfslist.sh font > $@ || (rm -f $@; exit 1)
 
 partmap-font_mod-font_font_cmd.lst: font/font_cmd.c 
$(font/font_cmd.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ifont -I$(srcdir)/font 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(font_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genpartmaplist.sh font > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifont -I$(srcdir)/font 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(font_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genpartmaplist.sh font > $@ || (rm -f $@; exit 1)
 
 
 font_mod-font_font.o: font/font.c $(font/font.c_DEPENDENCIES)
@@ -4148,13 +4148,13 @@
 PARTMAPFILES += partmap-font_mod-font_font.lst
 
 cmd-font_mod-font_font.lst: font/font.c $(font/font.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ifont -I$(srcdir)/font 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(font_mod_CFLAGS) -E $<       | sh 
$(srcdir)/gencmdlist.sh font > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifont -I$(srcdir)/font 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(font_mod_CFLAGS) -E $<      | sh 
$(srcdir)/gencmdlist.sh font > $@ || (rm -f $@; exit 1)
 
 fs-font_mod-font_font.lst: font/font.c $(font/font.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ifont -I$(srcdir)/font 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(font_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genfslist.sh font > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifont -I$(srcdir)/font 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(font_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genfslist.sh font > $@ || (rm -f $@; exit 1)
 
 partmap-font_mod-font_font.lst: font/font.c $(font/font.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ifont -I$(srcdir)/font 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(font_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genpartmaplist.sh font > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ifont -I$(srcdir)/font 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(font_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genpartmaplist.sh font > $@ || (rm -f $@; exit 1)
 
 
 font_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -4205,13 +4205,13 @@
 PARTMAPFILES += partmap-gfxterm_mod-term_gfxterm.lst
 
 cmd-gfxterm_mod-term_gfxterm.lst: term/gfxterm.c 
$(term/gfxterm.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Iterm -I$(srcdir)/term 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(gfxterm_mod_CFLAGS) -E $<    | sh 
$(srcdir)/gencmdlist.sh gfxterm > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iterm -I$(srcdir)/term 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(gfxterm_mod_CFLAGS) -E $<           | sh 
$(srcdir)/gencmdlist.sh gfxterm > $@ || (rm -f $@; exit 1)
 
 fs-gfxterm_mod-term_gfxterm.lst: term/gfxterm.c $(term/gfxterm.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Iterm -I$(srcdir)/term 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(gfxterm_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genfslist.sh gfxterm > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iterm -I$(srcdir)/term 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(gfxterm_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genfslist.sh gfxterm > $@ || (rm -f $@; exit 1)
 
 partmap-gfxterm_mod-term_gfxterm.lst: term/gfxterm.c 
$(term/gfxterm.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Iterm -I$(srcdir)/term 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(gfxterm_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genpartmaplist.sh gfxterm > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iterm -I$(srcdir)/term 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(gfxterm_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh gfxterm > $@ || (rm -f $@; exit 1)
 
 
 gfxterm_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -4265,13 +4265,13 @@
 PARTMAPFILES += partmap-elf_mod-kern_elf.lst
 
 cmd-elf_mod-kern_elf.lst: kern/elf.c $(kern/elf.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ikern -I$(srcdir)/kern 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(elf_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh elf > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ikern -I$(srcdir)/kern 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(elf_mod_CFLAGS) -E $<       | sh 
$(srcdir)/gencmdlist.sh elf > $@ || (rm -f $@; exit 1)
 
 fs-elf_mod-kern_elf.lst: kern/elf.c $(kern/elf.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ikern -I$(srcdir)/kern 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(elf_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh elf > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ikern -I$(srcdir)/kern 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(elf_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genfslist.sh elf > $@ || (rm -f $@; exit 1)
 
 partmap-elf_mod-kern_elf.lst: kern/elf.c $(kern/elf.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ikern -I$(srcdir)/kern 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(elf_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh elf > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ikern -I$(srcdir)/kern 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(elf_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genpartmaplist.sh elf > $@ || (rm -f $@; exit 1)
 
 
 elf_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -4322,13 +4322,13 @@
 PARTMAPFILES += partmap-gzio_mod-io_gzio.lst
 
 cmd-gzio_mod-io_gzio.lst: io/gzio.c $(io/gzio.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Iio -I$(srcdir)/io $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(gzio_mod_CFLAGS) -E $<           | sh 
$(srcdir)/gencmdlist.sh gzio > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iio -I$(srcdir)/io $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(gzio_mod_CFLAGS) -E $<          | sh $(srcdir)/gencmdlist.sh 
gzio > $@ || (rm -f $@; exit 1)
 
 fs-gzio_mod-io_gzio.lst: io/gzio.c $(io/gzio.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Iio -I$(srcdir)/io $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(gzio_mod_CFLAGS) -E $<           | sh $(srcdir)/genfslist.sh 
gzio > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iio -I$(srcdir)/io $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(gzio_mod_CFLAGS) -E $<          | sh $(srcdir)/genfslist.sh 
gzio > $@ || (rm -f $@; exit 1)
 
 partmap-gzio_mod-io_gzio.lst: io/gzio.c $(io/gzio.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Iio -I$(srcdir)/io $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(gzio_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh gzio > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iio -I$(srcdir)/io $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(gzio_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genpartmaplist.sh gzio > $@ || (rm -f $@; exit 1)
 
 
 gzio_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -4379,13 +4379,13 @@
 PARTMAPFILES += partmap-bufio_mod-io_bufio.lst
 
 cmd-bufio_mod-io_bufio.lst: io/bufio.c $(io/bufio.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Iio -I$(srcdir)/io $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(bufio_mod_CFLAGS) -E $<          | sh 
$(srcdir)/gencmdlist.sh bufio > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iio -I$(srcdir)/io $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(bufio_mod_CFLAGS) -E $<         | sh $(srcdir)/gencmdlist.sh 
bufio > $@ || (rm -f $@; exit 1)
 
 fs-bufio_mod-io_bufio.lst: io/bufio.c $(io/bufio.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Iio -I$(srcdir)/io $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(bufio_mod_CFLAGS) -E $<          | sh $(srcdir)/genfslist.sh 
bufio > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iio -I$(srcdir)/io $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(bufio_mod_CFLAGS) -E $<         | sh $(srcdir)/genfslist.sh 
bufio > $@ || (rm -f $@; exit 1)
 
 partmap-bufio_mod-io_bufio.lst: io/bufio.c $(io/bufio.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Iio -I$(srcdir)/io $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(bufio_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genpartmaplist.sh bufio > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iio -I$(srcdir)/io $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(bufio_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genpartmaplist.sh bufio > $@ || (rm -f $@; exit 1)
 
 
 bufio_mod_CFLAGS = $(COMMON_CFLAGS)

Modified: trunk/grub2/conf/i386-coreboot.mk
===================================================================
--- trunk/grub2/conf/i386-coreboot.mk   2009-03-22 12:28:00 UTC (rev 2043)
+++ trunk/grub2/conf/i386-coreboot.mk   2009-03-24 14:01:23 UTC (rev 2044)
@@ -676,13 +676,13 @@
 PARTMAPFILES += partmap-linux_mod-loader_i386_linux.lst
 
 cmd-linux_mod-loader_i386_linux.lst: loader/i386/linux.c 
$(loader/i386/linux.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Iloader/i386 -I$(srcdir)/loader/i386 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(linux_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh linux > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iloader/i386 -I$(srcdir)/loader/i386 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(linux_mod_CFLAGS) -E $<       | sh 
$(srcdir)/gencmdlist.sh linux > $@ || (rm -f $@; exit 1)
 
 fs-linux_mod-loader_i386_linux.lst: loader/i386/linux.c 
$(loader/i386/linux.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Iloader/i386 -I$(srcdir)/loader/i386 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(linux_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh linux > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iloader/i386 -I$(srcdir)/loader/i386 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(linux_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genfslist.sh linux > $@ || (rm -f $@; exit 1)
 
 partmap-linux_mod-loader_i386_linux.lst: loader/i386/linux.c 
$(loader/i386/linux.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Iloader/i386 -I$(srcdir)/loader/i386 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(linux_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh linux > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iloader/i386 -I$(srcdir)/loader/i386 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(linux_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genpartmaplist.sh linux > $@ || (rm -f $@; exit 1)
 
 
 linux_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -748,13 +748,13 @@
 PARTMAPFILES += partmap-normal_mod-normal_cmdline.lst
 
 cmd-normal_mod-normal_cmdline.lst: normal/cmdline.c 
$(normal/cmdline.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
 fs-normal_mod-normal_cmdline.lst: normal/cmdline.c 
$(normal/cmdline.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 partmap-normal_mod-normal_cmdline.lst: normal/cmdline.c 
$(normal/cmdline.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
 
 
 normal_mod-normal_command.o: normal/command.c $(normal/command.c_DEPENDENCIES)
@@ -767,13 +767,13 @@
 PARTMAPFILES += partmap-normal_mod-normal_command.lst
 
 cmd-normal_mod-normal_command.lst: normal/command.c 
$(normal/command.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
 fs-normal_mod-normal_command.lst: normal/command.c 
$(normal/command.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 partmap-normal_mod-normal_command.lst: normal/command.c 
$(normal/command.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
 
 
 normal_mod-normal_completion.o: normal/completion.c 
$(normal/completion.c_DEPENDENCIES)
@@ -786,13 +786,13 @@
 PARTMAPFILES += partmap-normal_mod-normal_completion.lst
 
 cmd-normal_mod-normal_completion.lst: normal/completion.c 
$(normal/completion.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
 fs-normal_mod-normal_completion.lst: normal/completion.c 
$(normal/completion.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 partmap-normal_mod-normal_completion.lst: normal/completion.c 
$(normal/completion.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
 
 
 normal_mod-normal_execute.o: normal/execute.c $(normal/execute.c_DEPENDENCIES)
@@ -805,13 +805,13 @@
 PARTMAPFILES += partmap-normal_mod-normal_execute.lst
 
 cmd-normal_mod-normal_execute.lst: normal/execute.c 
$(normal/execute.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
 fs-normal_mod-normal_execute.lst: normal/execute.c 
$(normal/execute.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 partmap-normal_mod-normal_execute.lst: normal/execute.c 
$(normal/execute.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
 
 
 normal_mod-normal_function.o: normal/function.c 
$(normal/function.c_DEPENDENCIES)
@@ -824,13 +824,13 @@
 PARTMAPFILES += partmap-normal_mod-normal_function.lst
 
 cmd-normal_mod-normal_function.lst: normal/function.c 
$(normal/function.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
 fs-normal_mod-normal_function.lst: normal/function.c 
$(normal/function.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 partmap-normal_mod-normal_function.lst: normal/function.c 
$(normal/function.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
 
 
 normal_mod-normal_lexer.o: normal/lexer.c $(normal/lexer.c_DEPENDENCIES)
@@ -843,13 +843,13 @@
 PARTMAPFILES += partmap-normal_mod-normal_lexer.lst
 
 cmd-normal_mod-normal_lexer.lst: normal/lexer.c $(normal/lexer.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
 fs-normal_mod-normal_lexer.lst: normal/lexer.c $(normal/lexer.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 partmap-normal_mod-normal_lexer.lst: normal/lexer.c 
$(normal/lexer.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
 
 
 normal_mod-normal_main.o: normal/main.c $(normal/main.c_DEPENDENCIES)
@@ -862,13 +862,13 @@
 PARTMAPFILES += partmap-normal_mod-normal_main.lst
 
 cmd-normal_mod-normal_main.lst: normal/main.c $(normal/main.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
 fs-normal_mod-normal_main.lst: normal/main.c $(normal/main.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 partmap-normal_mod-normal_main.lst: normal/main.c 
$(normal/main.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
 
 
 normal_mod-normal_menu.o: normal/menu.c $(normal/menu.c_DEPENDENCIES)
@@ -881,13 +881,13 @@
 PARTMAPFILES += partmap-normal_mod-normal_menu.lst
 
 cmd-normal_mod-normal_menu.lst: normal/menu.c $(normal/menu.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
 fs-normal_mod-normal_menu.lst: normal/menu.c $(normal/menu.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 partmap-normal_mod-normal_menu.lst: normal/menu.c 
$(normal/menu.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
 
 
 normal_mod-normal_menu_text.o: normal/menu_text.c 
$(normal/menu_text.c_DEPENDENCIES)
@@ -900,13 +900,13 @@
 PARTMAPFILES += partmap-normal_mod-normal_menu_text.lst
 
 cmd-normal_mod-normal_menu_text.lst: normal/menu_text.c 
$(normal/menu_text.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
 fs-normal_mod-normal_menu_text.lst: normal/menu_text.c 
$(normal/menu_text.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 partmap-normal_mod-normal_menu_text.lst: normal/menu_text.c 
$(normal/menu_text.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
 
 
 normal_mod-normal_color.o: normal/color.c $(normal/color.c_DEPENDENCIES)
@@ -919,13 +919,13 @@
 PARTMAPFILES += partmap-normal_mod-normal_color.lst
 
 cmd-normal_mod-normal_color.lst: normal/color.c $(normal/color.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
 fs-normal_mod-normal_color.lst: normal/color.c $(normal/color.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 partmap-normal_mod-normal_color.lst: normal/color.c 
$(normal/color.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
 
 
 normal_mod-normal_menu_viewer.o: normal/menu_viewer.c 
$(normal/menu_viewer.c_DEPENDENCIES)
@@ -938,13 +938,13 @@
 PARTMAPFILES += partmap-normal_mod-normal_menu_viewer.lst
 
 cmd-normal_mod-normal_menu_viewer.lst: normal/menu_viewer.c 
$(normal/menu_viewer.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
 fs-normal_mod-normal_menu_viewer.lst: normal/menu_viewer.c 
$(normal/menu_viewer.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 partmap-normal_mod-normal_menu_viewer.lst: normal/menu_viewer.c 
$(normal/menu_viewer.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
 
 
 normal_mod-normal_menu_entry.o: normal/menu_entry.c 
$(normal/menu_entry.c_DEPENDENCIES)
@@ -957,13 +957,13 @@
 PARTMAPFILES += partmap-normal_mod-normal_menu_entry.lst
 
 cmd-normal_mod-normal_menu_entry.lst: normal/menu_entry.c 
$(normal/menu_entry.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
 fs-normal_mod-normal_menu_entry.lst: normal/menu_entry.c 
$(normal/menu_entry.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 partmap-normal_mod-normal_menu_entry.lst: normal/menu_entry.c 
$(normal/menu_entry.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
 
 
 normal_mod-normal_misc.o: normal/misc.c $(normal/misc.c_DEPENDENCIES)
@@ -976,13 +976,13 @@
 PARTMAPFILES += partmap-normal_mod-normal_misc.lst
 
 cmd-normal_mod-normal_misc.lst: normal/misc.c $(normal/misc.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
 fs-normal_mod-normal_misc.lst: normal/misc.c $(normal/misc.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 partmap-normal_mod-normal_misc.lst: normal/misc.c 
$(normal/misc.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
 
 
 normal_mod-grub_script_tab.o: grub_script.tab.c 
$(grub_script.tab.c_DEPENDENCIES)
@@ -995,13 +995,13 @@
 PARTMAPFILES += partmap-normal_mod-grub_script_tab.lst
 
 cmd-normal_mod-grub_script_tab.lst: grub_script.tab.c 
$(grub_script.tab.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -I. -I$(srcdir)/. $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<           | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -I. -I$(srcdir)/. $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<          | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
 fs-normal_mod-grub_script_tab.lst: grub_script.tab.c 
$(grub_script.tab.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -I. -I$(srcdir)/. $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -I. -I$(srcdir)/. $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 partmap-normal_mod-grub_script_tab.lst: grub_script.tab.c 
$(grub_script.tab.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -I. -I$(srcdir)/. $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -I. -I$(srcdir)/. $(TARGET_CPPFLAGS)  
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
 
 
 normal_mod-normal_script.o: normal/script.c $(normal/script.c_DEPENDENCIES)
@@ -1014,13 +1014,13 @@
 PARTMAPFILES += partmap-normal_mod-normal_script.lst
 
 cmd-normal_mod-normal_script.lst: normal/script.c 
$(normal/script.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
 fs-normal_mod-normal_script.lst: normal/script.c 
$(normal/script.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 partmap-normal_mod-normal_script.lst: normal/script.c 
$(normal/script.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<         | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal -I$(srcdir)/normal 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
 
 
 normal_mod-normal_i386_setjmp.o: normal/i386/setjmp.S 
$(normal/i386/setjmp.S_DEPENDENCIES)
@@ -1033,13 +1033,13 @@
 PARTMAPFILES += partmap-normal_mod-normal_i386_setjmp.lst
 
 cmd-normal_mod-normal_i386_setjmp.lst: normal/i386/setjmp.S 
$(normal/i386/setjmp.S_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Inormal/i386 -I$(srcdir)/normal/i386 
$(TARGET_CPPFLAGS) $(TARGET_ASFLAGS) $(normal_mod_ASFLAGS) -E $<     | sh 
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal/i386 -I$(srcdir)/normal/i386 
$(TARGET_CPPFLAGS) -DASM_FILE=1 $(TARGET_ASFLAGS) $(normal_mod_ASFLAGS) -E $<   
     | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
 fs-normal_mod-normal_i386_setjmp.lst: normal/i386/setjmp.S 
$(normal/i386/setjmp.S_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Inormal/i386 -I$(srcdir)/normal/i386 
$(TARGET_CPPFLAGS) $(TARGET_ASFLAGS) $(normal_mod_ASFLAGS) -E $<     | sh 
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal/i386 -I$(srcdir)/normal/i386 
$(TARGET_CPPFLAGS) -DASM_FILE=1 $(TARGET_ASFLAGS) $(normal_mod_ASFLAGS) -E $<   
     | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 partmap-normal_mod-normal_i386_setjmp.lst: normal/i386/setjmp.S 
$(normal/i386/setjmp.S_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Inormal/i386 -I$(srcdir)/normal/i386 
$(TARGET_CPPFLAGS) $(TARGET_ASFLAGS) $(normal_mod_ASFLAGS) -E $<     | sh 
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Inormal/i386 -I$(srcdir)/normal/i386 
$(TARGET_CPPFLAGS) -DASM_FILE=1 $(TARGET_ASFLAGS) $(normal_mod_ASFLAGS) -E $<   
     | sh $(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
 
 
 normal_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1091,13 +1091,13 @@
 PARTMAPFILES += partmap-reboot_mod-commands_reboot.lst
 
 cmd-reboot_mod-commands_reboot.lst: commands/reboot.c 
$(commands/reboot.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(reboot_mod_CFLAGS) -E $<     | sh 
$(srcdir)/gencmdlist.sh reboot > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(reboot_mod_CFLAGS) -E $<    | sh 
$(srcdir)/gencmdlist.sh reboot > $@ || (rm -f $@; exit 1)
 
 fs-reboot_mod-commands_reboot.lst: commands/reboot.c 
$(commands/reboot.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(reboot_mod_CFLAGS) -E $<     | sh 
$(srcdir)/genfslist.sh reboot > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(reboot_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genfslist.sh reboot > $@ || (rm -f $@; exit 1)
 
 partmap-reboot_mod-commands_reboot.lst: commands/reboot.c 
$(commands/reboot.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(reboot_mod_CFLAGS) -E $<     | sh 
$(srcdir)/genpartmaplist.sh reboot > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(reboot_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genpartmaplist.sh reboot > $@ || (rm -f $@; exit 1)
 
 
 reboot_mod-kern_i386_reboot.o: kern/i386/reboot.c 
$(kern/i386/reboot.c_DEPENDENCIES)
@@ -1110,13 +1110,13 @@
 PARTMAPFILES += partmap-reboot_mod-kern_i386_reboot.lst
 
 cmd-reboot_mod-kern_i386_reboot.lst: kern/i386/reboot.c 
$(kern/i386/reboot.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ikern/i386 -I$(srcdir)/kern/i386 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(reboot_mod_CFLAGS) -E $<           | sh 
$(srcdir)/gencmdlist.sh reboot > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ikern/i386 -I$(srcdir)/kern/i386 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(reboot_mod_CFLAGS) -E $<          | sh 
$(srcdir)/gencmdlist.sh reboot > $@ || (rm -f $@; exit 1)
 
 fs-reboot_mod-kern_i386_reboot.lst: kern/i386/reboot.c 
$(kern/i386/reboot.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ikern/i386 -I$(srcdir)/kern/i386 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(reboot_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genfslist.sh reboot > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ikern/i386 -I$(srcdir)/kern/i386 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(reboot_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genfslist.sh reboot > $@ || (rm -f $@; exit 1)
 
 partmap-reboot_mod-kern_i386_reboot.lst: kern/i386/reboot.c 
$(kern/i386/reboot.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ikern/i386 -I$(srcdir)/kern/i386 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(reboot_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh reboot > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ikern/i386 -I$(srcdir)/kern/i386 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(reboot_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genpartmaplist.sh reboot > $@ || (rm -f $@; exit 1)
 
 
 reboot_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1167,13 +1167,13 @@
 PARTMAPFILES += partmap-halt_mod-commands_halt.lst
 
 cmd-halt_mod-commands_halt.lst: commands/halt.c 
$(commands/halt.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(halt_mod_CFLAGS) -E $<       | sh 
$(srcdir)/gencmdlist.sh halt > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(halt_mod_CFLAGS) -E $<      | sh 
$(srcdir)/gencmdlist.sh halt > $@ || (rm -f $@; exit 1)
 
 fs-halt_mod-commands_halt.lst: commands/halt.c $(commands/halt.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(halt_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genfslist.sh halt > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(halt_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genfslist.sh halt > $@ || (rm -f $@; exit 1)
 
 partmap-halt_mod-commands_halt.lst: commands/halt.c 
$(commands/halt.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(halt_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genpartmaplist.sh halt > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands -I$(srcdir)/commands 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(halt_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genpartmaplist.sh halt > $@ || (rm -f $@; exit 1)
 
 
 halt_mod-kern_i386_halt.o: kern/i386/halt.c $(kern/i386/halt.c_DEPENDENCIES)
@@ -1186,13 +1186,13 @@
 PARTMAPFILES += partmap-halt_mod-kern_i386_halt.lst
 
 cmd-halt_mod-kern_i386_halt.lst: kern/i386/halt.c 
$(kern/i386/halt.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Ikern/i386 -I$(srcdir)/kern/i386 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(halt_mod_CFLAGS) -E $<     | sh 
$(srcdir)/gencmdlist.sh halt > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ikern/i386 -I$(srcdir)/kern/i386 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(halt_mod_CFLAGS) -E $<    | sh 
$(srcdir)/gencmdlist.sh halt > $@ || (rm -f $@; exit 1)
 
 fs-halt_mod-kern_i386_halt.lst: kern/i386/halt.c 
$(kern/i386/halt.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Ikern/i386 -I$(srcdir)/kern/i386 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(halt_mod_CFLAGS) -E $<     | sh 
$(srcdir)/genfslist.sh halt > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ikern/i386 -I$(srcdir)/kern/i386 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(halt_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genfslist.sh halt > $@ || (rm -f $@; exit 1)
 
 partmap-halt_mod-kern_i386_halt.lst: kern/i386/halt.c 
$(kern/i386/halt.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Ikern/i386 -I$(srcdir)/kern/i386 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(halt_mod_CFLAGS) -E $<     | sh 
$(srcdir)/genpartmaplist.sh halt > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Ikern/i386 -I$(srcdir)/kern/i386 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(halt_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genpartmaplist.sh halt > $@ || (rm -f $@; exit 1)
 
 
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1243,13 +1243,13 @@
 PARTMAPFILES += partmap-serial_mod-term_i386_pc_serial.lst
 
 cmd-serial_mod-term_i386_pc_serial.lst: term/i386/pc/serial.c 
$(term/i386/pc/serial.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Iterm/i386/pc -I$(srcdir)/term/i386/pc 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(serial_mod_CFLAGS) -E $<     | sh 
$(srcdir)/gencmdlist.sh serial > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iterm/i386/pc -I$(srcdir)/term/i386/pc 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(serial_mod_CFLAGS) -E $<    | sh 
$(srcdir)/gencmdlist.sh serial > $@ || (rm -f $@; exit 1)
 
 fs-serial_mod-term_i386_pc_serial.lst: term/i386/pc/serial.c 
$(term/i386/pc/serial.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Iterm/i386/pc -I$(srcdir)/term/i386/pc 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(serial_mod_CFLAGS) -E $<     | sh 
$(srcdir)/genfslist.sh serial > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iterm/i386/pc -I$(srcdir)/term/i386/pc 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(serial_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genfslist.sh serial > $@ || (rm -f $@; exit 1)
 
 partmap-serial_mod-term_i386_pc_serial.lst: term/i386/pc/serial.c 
$(term/i386/pc/serial.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Iterm/i386/pc -I$(srcdir)/term/i386/pc 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(serial_mod_CFLAGS) -E $<     | sh 
$(srcdir)/genpartmaplist.sh serial > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iterm/i386/pc -I$(srcdir)/term/i386/pc 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(serial_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genpartmaplist.sh serial > $@ || (rm -f $@; exit 1)
 
 
 serial_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1304,13 +1304,13 @@
 PARTMAPFILES += partmap-multiboot_mod-loader_i386_multiboot.lst
 
 cmd-multiboot_mod-loader_i386_multiboot.lst: loader/i386/multiboot.c 
$(loader/i386/multiboot.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Iloader/i386 -I$(srcdir)/loader/i386 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -E $<    | sh 
$(srcdir)/gencmdlist.sh multiboot > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iloader/i386 -I$(srcdir)/loader/i386 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -E $<           | 
sh $(srcdir)/gencmdlist.sh multiboot > $@ || (rm -f $@; exit 1)
 
 fs-multiboot_mod-loader_i386_multiboot.lst: loader/i386/multiboot.c 
$(loader/i386/multiboot.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Iloader/i386 -I$(srcdir)/loader/i386 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genfslist.sh multiboot > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iloader/i386 -I$(srcdir)/loader/i386 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -E $<           | 
sh $(srcdir)/genfslist.sh multiboot > $@ || (rm -f $@; exit 1)
 
 partmap-multiboot_mod-loader_i386_multiboot.lst: loader/i386/multiboot.c 
$(loader/i386/multiboot.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Iloader/i386 -I$(srcdir)/loader/i386 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genpartmaplist.sh multiboot > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iloader/i386 -I$(srcdir)/loader/i386 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -E $<           | 
sh $(srcdir)/genpartmaplist.sh multiboot > $@ || (rm -f $@; exit 1)
 
 
 multiboot_mod-loader_i386_multiboot_helper.o: loader/i386/multiboot_helper.S 
$(loader/i386/multiboot_helper.S_DEPENDENCIES)
@@ -1323,13 +1323,13 @@
 PARTMAPFILES += partmap-multiboot_mod-loader_i386_multiboot_helper.lst
 
 cmd-multiboot_mod-loader_i386_multiboot_helper.lst: 
loader/i386/multiboot_helper.S $(loader/i386/multiboot_helper.S_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Iloader/i386 -I$(srcdir)/loader/i386 
$(TARGET_CPPFLAGS) $(TARGET_ASFLAGS) $(multiboot_mod_ASFLAGS) -E $<          | 
sh $(srcdir)/gencmdlist.sh multiboot > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iloader/i386 -I$(srcdir)/loader/i386 
$(TARGET_CPPFLAGS) -DASM_FILE=1 $(TARGET_ASFLAGS) $(multiboot_mod_ASFLAGS) -E 
$<     | sh $(srcdir)/gencmdlist.sh multiboot > $@ || (rm -f $@; exit 1)
 
 fs-multiboot_mod-loader_i386_multiboot_helper.lst: 
loader/i386/multiboot_helper.S $(loader/i386/multiboot_helper.S_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Iloader/i386 -I$(srcdir)/loader/i386 
$(TARGET_CPPFLAGS) $(TARGET_ASFLAGS) $(multiboot_mod_ASFLAGS) -E $<          | 
sh $(srcdir)/genfslist.sh multiboot > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iloader/i386 -I$(srcdir)/loader/i386 
$(TARGET_CPPFLAGS) -DASM_FILE=1 $(TARGET_ASFLAGS) $(multiboot_mod_ASFLAGS) -E 
$<     | sh $(srcdir)/genfslist.sh multiboot > $@ || (rm -f $@; exit 1)
 
 partmap-multiboot_mod-loader_i386_multiboot_helper.lst: 
loader/i386/multiboot_helper.S $(loader/i386/multiboot_helper.S_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Iloader/i386 -I$(srcdir)/loader/i386 
$(TARGET_CPPFLAGS) $(TARGET_ASFLAGS) $(multiboot_mod_ASFLAGS) -E $<          | 
sh $(srcdir)/genpartmaplist.sh multiboot > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iloader/i386 -I$(srcdir)/loader/i386 
$(TARGET_CPPFLAGS) -DASM_FILE=1 $(TARGET_ASFLAGS) $(multiboot_mod_ASFLAGS) -E 
$<     | sh $(srcdir)/genpartmaplist.sh multiboot > $@ || (rm -f $@; exit 1)
 
 
 multiboot_mod-loader_i386_pc_multiboot2.o: loader/i386/pc/multiboot2.c 
$(loader/i386/pc/multiboot2.c_DEPENDENCIES)
@@ -1342,13 +1342,13 @@
 PARTMAPFILES += partmap-multiboot_mod-loader_i386_pc_multiboot2.lst
 
 cmd-multiboot_mod-loader_i386_pc_multiboot2.lst: loader/i386/pc/multiboot2.c 
$(loader/i386/pc/multiboot2.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Iloader/i386/pc 
-I$(srcdir)/loader/i386/pc $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(multiboot_mod_CFLAGS) -E $<      | sh $(srcdir)/gencmdlist.sh multiboot > $@ 
|| (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iloader/i386/pc 
-I$(srcdir)/loader/i386/pc $(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) 
$(multiboot_mod_CFLAGS) -E $<     | sh $(srcdir)/gencmdlist.sh multiboot > $@ 
|| (rm -f $@; exit 1)
 
 fs-multiboot_mod-loader_i386_pc_multiboot2.lst: loader/i386/pc/multiboot2.c 
$(loader/i386/pc/multiboot2.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Iloader/i386/pc 
-I$(srcdir)/loader/i386/pc $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(multiboot_mod_CFLAGS) -E $<      | sh $(srcdir)/genfslist.sh multiboot > $@ 
|| (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iloader/i386/pc 
-I$(srcdir)/loader/i386/pc $(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) 
$(multiboot_mod_CFLAGS) -E $<     | sh $(srcdir)/genfslist.sh multiboot > $@ || 
(rm -f $@; exit 1)
 
 partmap-multiboot_mod-loader_i386_pc_multiboot2.lst: 
loader/i386/pc/multiboot2.c $(loader/i386/pc/multiboot2.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Iloader/i386/pc 
-I$(srcdir)/loader/i386/pc $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(multiboot_mod_CFLAGS) -E $<      | sh $(srcdir)/genpartmaplist.sh multiboot > 
$@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iloader/i386/pc 
-I$(srcdir)/loader/i386/pc $(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) 
$(multiboot_mod_CFLAGS) -E $<     | sh $(srcdir)/genpartmaplist.sh multiboot > 
$@ || (rm -f $@; exit 1)
 
 
 multiboot_mod-loader_multiboot2.o: loader/multiboot2.c 
$(loader/multiboot2.c_DEPENDENCIES)
@@ -1361,13 +1361,13 @@
 PARTMAPFILES += partmap-multiboot_mod-loader_multiboot2.lst
 
 cmd-multiboot_mod-loader_multiboot2.lst: loader/multiboot2.c 
$(loader/multiboot2.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Iloader -I$(srcdir)/loader 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -E $<      | sh 
$(srcdir)/gencmdlist.sh multiboot > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iloader -I$(srcdir)/loader 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -E $<     | sh 
$(srcdir)/gencmdlist.sh multiboot > $@ || (rm -f $@; exit 1)
 
 fs-multiboot_mod-loader_multiboot2.lst: loader/multiboot2.c 
$(loader/multiboot2.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Iloader -I$(srcdir)/loader 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genfslist.sh multiboot > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iloader -I$(srcdir)/loader 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -E $<     | sh 
$(srcdir)/genfslist.sh multiboot > $@ || (rm -f $@; exit 1)
 
 partmap-multiboot_mod-loader_multiboot2.lst: loader/multiboot2.c 
$(loader/multiboot2.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Iloader -I$(srcdir)/loader 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genpartmaplist.sh multiboot > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iloader -I$(srcdir)/loader 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -E $<     | sh 
$(srcdir)/genpartmaplist.sh multiboot > $@ || (rm -f $@; exit 1)
 
 
 multiboot_mod-loader_multiboot_loader.o: loader/multiboot_loader.c 
$(loader/multiboot_loader.c_DEPENDENCIES)
@@ -1380,13 +1380,13 @@
 PARTMAPFILES += partmap-multiboot_mod-loader_multiboot_loader.lst
 
 cmd-multiboot_mod-loader_multiboot_loader.lst: loader/multiboot_loader.c 
$(loader/multiboot_loader.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Iloader -I$(srcdir)/loader 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -E $<      | sh 
$(srcdir)/gencmdlist.sh multiboot > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iloader -I$(srcdir)/loader 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -E $<     | sh 
$(srcdir)/gencmdlist.sh multiboot > $@ || (rm -f $@; exit 1)
 
 fs-multiboot_mod-loader_multiboot_loader.lst: loader/multiboot_loader.c 
$(loader/multiboot_loader.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Iloader -I$(srcdir)/loader 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genfslist.sh multiboot > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iloader -I$(srcdir)/loader 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -E $<     | sh 
$(srcdir)/genfslist.sh multiboot > $@ || (rm -f $@; exit 1)
 
 partmap-multiboot_mod-loader_multiboot_loader.lst: loader/multiboot_loader.c 
$(loader/multiboot_loader.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Iloader -I$(srcdir)/loader 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -E $<      | sh 
$(srcdir)/genpartmaplist.sh multiboot > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iloader -I$(srcdir)/loader 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) -E $<     | sh 
$(srcdir)/genpartmaplist.sh multiboot > $@ || (rm -f $@; exit 1)
 
 
 multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1438,13 +1438,13 @@
 PARTMAPFILES += partmap-aout_mod-loader_aout.lst
 
 cmd-aout_mod-loader_aout.lst: loader/aout.c $(loader/aout.c_DEPENDENCIES) 
gencmdlist.sh
-       set -e;           $(TARGET_CC) -Iloader -I$(srcdir)/loader 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(aout_mod_CFLAGS) -E $<           | sh 
$(srcdir)/gencmdlist.sh aout > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iloader -I$(srcdir)/loader 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(aout_mod_CFLAGS) -E $<          | sh 
$(srcdir)/gencmdlist.sh aout > $@ || (rm -f $@; exit 1)
 
 fs-aout_mod-loader_aout.lst: loader/aout.c $(loader/aout.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Iloader -I$(srcdir)/loader 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(aout_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genfslist.sh aout > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iloader -I$(srcdir)/loader 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(aout_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genfslist.sh aout > $@ || (rm -f $@; exit 1)
 
 partmap-aout_mod-loader_aout.lst: loader/aout.c $(loader/aout.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Iloader -I$(srcdir)/loader 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(aout_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh aout > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Iloader -I$(srcdir)/loader 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(aout_mod_CFLAGS) -E $<          | sh 
$(srcdir)/genpartmaplist.sh aout > $@ || (rm -f $@; exit 1)
 
 
 aout_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1495,13 +1495,13 @@
 PARTMAPFILES += partmap-play_mod-commands_i386_pc_play.lst
 
 cmd-play_mod-commands_i386_pc_play.lst: commands/i386/pc/play.c 
$(commands/i386/pc/play.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands/i386/pc 
-I$(srcdir)/commands/i386/pc $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(play_mod_CFLAGS) -E $<       | sh $(srcdir)/gencmdlist.sh play > $@ || (rm -f 
$@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands/i386/pc 
-I$(srcdir)/commands/i386/pc $(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) 
$(play_mod_CFLAGS) -E $<      | sh $(srcdir)/gencmdlist.sh play > $@ || (rm -f 
$@; exit 1)
 
 fs-play_mod-commands_i386_pc_play.lst: commands/i386/pc/play.c 
$(commands/i386/pc/play.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands/i386/pc 
-I$(srcdir)/commands/i386/pc $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(play_mod_CFLAGS) -E $<       | sh $(srcdir)/genfslist.sh play > $@ || (rm -f 
$@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands/i386/pc 
-I$(srcdir)/commands/i386/pc $(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) 
$(play_mod_CFLAGS) -E $<      | sh $(srcdir)/genfslist.sh play > $@ || (rm -f 
$@; exit 1)
 
 partmap-play_mod-commands_i386_pc_play.lst: commands/i386/pc/play.c 
$(commands/i386/pc/play.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands/i386/pc 
-I$(srcdir)/commands/i386/pc $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(play_mod_CFLAGS) -E $<       | sh $(srcdir)/genpartmaplist.sh play > $@ || 
(rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Icommands/i386/pc 
-I$(srcdir)/commands/i386/pc $(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) 
$(play_mod_CFLAGS) -E $<      | sh $(srcdir)/genpartmaplist.sh play > $@ || (rm 
-f $@; exit 1)
 
 
 play_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1552,13 +1552,13 @@
 PARTMAPFILES += partmap-ata_mod-disk_ata.lst
 
 cmd-ata_mod-disk_ata.lst: disk/ata.c $(disk/ata.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(ata_mod_CFLAGS) -E $<        | sh 
$(srcdir)/gencmdlist.sh ata > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(ata_mod_CFLAGS) -E $<       | sh 
$(srcdir)/gencmdlist.sh ata > $@ || (rm -f $@; exit 1)
 
 fs-ata_mod-disk_ata.lst: disk/ata.c $(disk/ata.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(ata_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genfslist.sh ata > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(ata_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genfslist.sh ata > $@ || (rm -f $@; exit 1)
 
 partmap-ata_mod-disk_ata.lst: disk/ata.c $(disk/ata.c_DEPENDENCIES) 
genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(ata_mod_CFLAGS) -E $<        | sh 
$(srcdir)/genpartmaplist.sh ata > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(ata_mod_CFLAGS) -E $<       | sh 
$(srcdir)/genpartmaplist.sh ata > $@ || (rm -f $@; exit 1)
 
 
 ata_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1609,13 +1609,13 @@
 PARTMAPFILES += partmap-memdisk_mod-disk_memdisk.lst
 
 cmd-memdisk_mod-disk_memdisk.lst: disk/memdisk.c 
$(disk/memdisk.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(memdisk_mod_CFLAGS) -E $<    | sh 
$(srcdir)/gencmdlist.sh memdisk > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(memdisk_mod_CFLAGS) -E $<           | sh 
$(srcdir)/gencmdlist.sh memdisk > $@ || (rm -f $@; exit 1)
 
 fs-memdisk_mod-disk_memdisk.lst: disk/memdisk.c $(disk/memdisk.c_DEPENDENCIES) 
genfslist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(memdisk_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genfslist.sh memdisk > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(memdisk_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genfslist.sh memdisk > $@ || (rm -f $@; exit 1)
 
 partmap-memdisk_mod-disk_memdisk.lst: disk/memdisk.c 
$(disk/memdisk.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(memdisk_mod_CFLAGS) -E $<    | sh 
$(srcdir)/genpartmaplist.sh memdisk > $@ || (rm -f $@; exit 1)
+       set -e;           $(TARGET_CC) -Idisk -I$(srcdir)/disk 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(memdisk_mod_CFLAGS) -E $<           | sh 
$(srcdir)/genpartmaplist.sh memdisk > $@ || (rm -f $@; exit 1)
 
 
 memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -1666,13 +1666,13 @@
 PARTMAPFILES += partmap-pci_mod-bus_pci.lst
 
 cmd-pci_mod-bus_pci.lst: bus/pci.c $(bus/pci.c_DEPENDENCIES) gencmdlist.sh

@@ Diff output truncated at 153600 characters. @@




reply via email to

[Prev in Thread] Current Thread [Next in Thread]