Changeset 1f81129


Ignore:
Timestamp:
11/12/2006 12:10:25 PM (17 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
Children:
1838bc7
Parents:
ca6b261
Message:

Reordered makefile_functions.

Location:
common
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • common/libs/func_custom_pkgs

    rca6b261 r1f81129  
    7070        @./progress_bar.sh \$@ \$\$PPID &
    7171        @\$(call remove_existing_dirs2,${PKG_FILE})
    72         @\$(call unpack3,${PKG_FILE})
     72        @\$(call unpack2,${PKG_FILE})
    7373        @\$(call get_pkg_root2)
    7474        @( time { source envars && /\$(SCRIPT_ROOT)/custom-commands/scripts/${THIS_SCRIPT} >>logs/${THIS_SCRIPT} 2>&1 ; } ) 2>>logs/${THIS_SCRIPT}

  • common/libs/func_wrt_Makefile

    rca6b261 r1f81129  
    163163(
    164164cat  << EOF
    165         @\$(call unpack3,$FILE)
     165        @\$(call unpack2,$FILE)
    166166        @\$(call get_pkg_root2)
    167167EOF

  • common/makefile-functions

    rca6b261 r1f81129  
    1717nl_     = ""
    1818
     19#==== BUILD MESSAGES ===
     20
    1921define echo_PHASE
    2022  @clear
    … …  
    3739  @echo $(BOLD)$(BLUE)$@
    3840  @echo $(WHITE)You are going to log into the user account $(BOLD)$(YELLOW)$(LUSER)$(OFF)
    39   @echo su requires a password 
     41  @echo su requires a password
    4042endef
    4143
    … …  
    5254  @echo $(BOLD)$(1) target $(BLUE)$@$(BOLD)$(WHITE)
    5355endef
     56
     57#=======================
     58
     59
     60#=== BUILD FUNCTIONS ===
    5461
    5562define remove_existing_dirs
    … …  
    6774endef
    6875
    69 define remove_build_dirs
    70   @ROOT=`head -n1 $(SRCSDIR)/$(PKG_LST) | sed 's@^./@@;s@/.*@@'` && \
    71   rm -rf $(SRCSDIR)/$$ROOT && \
    72   rm -rf $(SRCSDIR)/$(1)-build
    73 endef
    74 
    75 define remove_build_dirs2
    76   @ROOT=`head -n1 $(SRC)/$(PKG_LST) | sed 's@^./@@;s@/.*@@'` && \
    77   rm -rf $(SRC)/$$ROOT && \
    78   rm -rf $(SRC)/$(1)-build
    79 endef
    80 
    81 define housekeeping
    82   @touch  $@ && \
    83   sleep .25 && \
    84   echo  -e "\n" $(BOLD)Target $(BLUE)$@ $(WHITE)$(BOLD)OK && \
    85   echo --------------------------------------------------------------------------------$(WHITE)
    86 
    87 endef
     76#==#
     77
     78define unpack
     79  @cd $(SRCSDIR) && \
     80  tar -xvf `ls -t $(1) | head -n1` > $(PKG_LST)
     81endef
     82
     83define unpack2
     84  @cd $(SRC) && \
     85  tar -xvf `ls -t $(1) | head -n1` > $(PKG_LST)
     86endef
     87
     88#==#
    8889
    8990define get_pkg_root
    … …  
    107108endef
    108109
    109 define unpack
    110   @cd $(SRCSDIR) && \
    111   tar -xvf `ls -t $(1) | head -n1` > $(PKG_LST)
    112 endef
    113 
    114 define unpack2
    115   @cd $(SRCSDIR) && \
    116   /tools/bin/tar -xvf `ls -t $(1) | head -n1` > $(PKG_LST)
    117 endef
    118 
    119 define unpack3
    120   @cd $(SRC) && \
    121   tar -xvf `ls -t $(1) | head -n1` > $(PKG_LST)
    122 endef
     110#==#
     111
     112define remove_build_dirs
     113  @ROOT=`head -n1 $(SRCSDIR)/$(PKG_LST) | sed 's@^./@@;s@/.*@@'` && \
     114  rm -rf $(SRCSDIR)/$$ROOT && \
     115  rm -rf $(SRCSDIR)/$(1)-build
     116endef
     117
     118define remove_build_dirs2
     119  @ROOT=`head -n1 $(SRC)/$(PKG_LST) | sed 's@^./@@;s@/.*@@'` && \
     120  rm -rf $(SRC)/$$ROOT && \
     121  rm -rf $(SRC)/$(1)-build
     122endef
     123
     124#==#
     125
     126define housekeeping
     127  @touch  $@ && \
     128  sleep .25 && \
     129  echo  -e "\n" $(BOLD)Target $(BLUE)$@ $(WHITE)$(BOLD)OK && \
     130  echo --------------------------------------------------------------------------------$(WHITE)
     131
     132endef
     133
     134#=======================
     135
     136
     137#==== FINAL MESSAGES ===
    123138
    124139define echo_report
Note: See TracChangeset for help on using the changeset viewer.