Changeset 93f38e7


Ignore:
Timestamp:
06/10/2006 03:58:06 PM (18 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
Children:
4524fb2
Parents:
ddf5f77
Message:

Ported new Makefile output look to HLFS and CLFS modules.

Files:
3 edited

Legend:

Unmodified
Added
Removed

  • CLFS/master.sh

    rddf5f77 r93f38e7  
    2828        fi;
    2929        @chmod a+wt \$(MOUNT_PT)/sources && \\
    30         touch \$@
     30        touch \$@ && \\
     31        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
     32        echo --------------------------------------------------------------------------------\$(WHITE)
    3133
    3234024-creatingcrossdir: 023-creatingtoolsdir
    … …  
    3436        rm -f /cross-tools && \\
    3537        ln -s \$(MOUNT_PT)/cross-tools /
    36         @touch \$@
     38        @touch \$@ && \\
     39        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
     40        echo --------------------------------------------------------------------------------\$(WHITE)
    3741
    3842025-addinguser:  024-creatingcrossdir
    … …  
    4852        chown lfs \$(MOUNT_PT)/cross-tools && \\
    4953        chown lfs \$(MOUNT_PT)/sources && \\
    50         touch \$@
     54        touch \$@ && \\
     55        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
     56        echo --------------------------------------------------------------------------------\$(WHITE)
    5157
    5258026-settingenvironment:  025-addinguser
    … …  
    7480        @chown lfs:lfs /home/lfs/.bashrc && \\
    7581        touch envars && \\
    76         touch \$@
     82        touch \$@ && \\
     83        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
     84        echo --------------------------------------------------------------------------------\$(WHITE)
    7785EOF
    7886) >> $MKFILE.tmp
    … …  
    139147    #
    140148    # Include a touch of the target name so make can check if it's already been made.
    141     echo -e '\t@touch $@' >> $MKFILE.tmp
     149    wrt_touch
    142150    #
    143151    #--------------------------------------------------------------------#
    … …  
    192200    #
    193201    # Include a touch of the target name so make can check if it's already been made.
    194     echo -e '\t@touch $@' >> $MKFILE.tmp
     202    wrt_touch
    195203    #
    196204    #--------------------------------------------------------------------#
    … …  
    276284    #
    277285    # Include a touch of the target name so make can check if it's already been made.
    278     echo -e '\t@touch $@' >> $MKFILE.tmp
     286    wrt_touch
    279287    #
    280288    #--------------------------------------------------------------------#
    … …  
    342350    #
    343351    # Include a touch of the target name so make can check if it's already been made.
    344     echo -e '\t@touch $@' >> $MKFILE.tmp
     352    wrt_touch
    345353    #
    346354    #--------------------------------------------------------------------#
    … …  
    396404    #
    397405    # Include a touch of the target name so make can check if it's already been made.
    398     echo -e '\t@touch $@' >> $MKFILE.tmp
     406    wrt_touch
    399407    #
    400408    #--------------------------------------------------------------------#
    … …  
    451459    #
    452460    # Include a touch of the target name so make can check if it's already been made.
    453     echo -e '\t@touch $@' >> $MKFILE.tmp
     461    wrt_touch
    454462    #
    455463    #--------------------------------------------------------------------#
    … …  
    561569    #
    562570    # Include a touch of the target name so make can check if it's already been made.
    563     echo -e '\t@touch $@' >> $MKFILE.tmp
     571    wrt_touch
    564572    #
    565573    #--------------------------------------------------------------------#
    … …  
    674682    #
    675683    # Include a touch of the target name so make can check if it's already been made.
    676     echo -e '\t@touch $@' >> $MKFILE.tmp
     684    wrt_touch
    677685    #
    678686    #--------------------------------------------------------------------#
    … …  
    736744    #
    737745    # Include a touch of the target name so make can check if it's already been made.
    738     echo -e '\t@touch $@' >> $MKFILE.tmp
     746    wrt_touch
    739747    #
    740748    #--------------------------------------------------------------------#
    … …  
    797805    #
    798806    # Include a touch of the target name so make can check if it's already been made.
    799     echo -e '\t@touch $@' >> $MKFILE.tmp
     807    wrt_touch
    800808    #
    801809    #--------------------------------------------------------------------#
    … …  
    871879    #
    872880    # Include a touch of the target name so make can check if it's already been made.
    873     echo -e '\t@touch $@' >> $MKFILE.tmp
     881    wrt_touch
    874882    #
    875883    #--------------------------------------------------------------------#
    … …  
    951959    #
    952960    # Include a touch of the target name so make can check if it's already been made.
    953     echo -e '\t@touch $@' >> $MKFILE.tmp
     961    wrt_touch
    954962    #
    955963    #--------------------------------------------------------------------#
    … …  
    10971105        fi;
    10981106        @chown lfs:lfs /home/lfs/.bash* && \\
    1099         touch \$@
     1107        touch \$@ && \\
     1108        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
     1109        echo --------------------------------------------------------------------------------\$(WHITE)
    11001110
    11011111do-housekeeping:
    … …  
    11771187        fi;
    11781188        @chown lfs:lfs /home/lfs/.bash* && \\
    1179         touch \$@
     1189        touch \$@ && \\
     1190        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
     1191        echo --------------------------------------------------------------------------------\$(WHITE)
    11801192
    11811193

  • HLFS/master.sh

    rddf5f77 r93f38e7  
    3838        fi;
    3939        @chmod a+wt \$(MOUNT_PT)/sources && \\
    40         touch \$@
     40        touch \$@ && \\
     41        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
     42        echo --------------------------------------------------------------------------------\$(WHITE)
    4143
    4244021-addinguser:  020-creatingtoolsdir
    … …  
    5052        @chown lfs \$(MOUNT_PT)/tools && \\
    5153        chown lfs \$(MOUNT_PT)/sources && \\
    52         touch \$@
     54        touch \$@ && \\
     55        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
     56        echo --------------------------------------------------------------------------------\$(WHITE)
    5357
    5458022-settingenvironment:  021-addinguser
    … …  
    7377        chown lfs:lfs /home/lfs/.bashrc && \\
    7478        touch envars && \\
    75         touch \$@
     79        touch \$@ && \\
     80        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
     81        echo --------------------------------------------------------------------------------\$(WHITE)
    7682EOF
    7783) >> $MKFILE.tmp
    … …  
    198204
    199205    # Include a touch of the target name so make can check if it's already been made.
    200     echo -e '\t@touch $@' >> $MKFILE.tmp
     206    wrt_touch
    201207    #
    202208    #--------------------------------------------------------------------#
    … …  
    366372
    367373    # Include a touch of the target name so make can check if it's already been made.
    368     echo -e '\t@touch $@' >> $MKFILE.tmp
     374    wrt_touch
    369375    #
    370376    #--------------------------------------------------------------------#
    … …  
    458464
    459465    # Include a touch of the target name so make can check if it's already been made.
    460     echo -e '\t@touch $@' >> $MKFILE.tmp
     466    wrt_touch
    461467    #
    462468    #--------------------------------------------------------------------#
    … …  
    579585        fi;
    580586        @chown lfs:lfs /home/lfs/.bash* && \\
    581         touch \$@
     587        touch \$@ && \\
     588        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
     589        echo --------------------------------------------------------------------------------\$(WHITE)
    582590
    583591do-housekeeping:

  • common/func_compare.sh

    rddf5f77 r93f38e7  
    102102
    103103#----------------------------------#
    104 wrt_logs() {             #
     104wrt_logs() {                       #
    105105#----------------------------------#
    106106  local ITERATION=iteration-$1
    … …  
    112112        mv ${LOGS} $ITERATION && \\
    113113        popd 1> /dev/null
    114         @touch \$@
     114        @touch \$@ && \\
     115        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
     116        echo --------------------------------------------------------------------------------\$(WHITE)
    115117EOF
    116118) >> $MKFILE.tmp
Note: See TracChangeset for help on using the changeset viewer.