Fix some files.
This commit is contained in:
		
							parent
							
								
									167ff9b843
								
							
						
					
					
						commit
						19bb0c3f38
					
				| 
						 | 
					@ -24,6 +24,10 @@
 | 
				
			||||||
[ -z "${FINALLIBDIR}" ] && FINALLIBDIR="${LIBDIR}"
 | 
					[ -z "${FINALLIBDIR}" ] && FINALLIBDIR="${LIBDIR}"
 | 
				
			||||||
[ -z "${FINALINCLUDEDIR}" ] && FINALINCLUDEDIR="${INCLUDEDIR}"
 | 
					[ -z "${FINALINCLUDEDIR}" ] && FINALINCLUDEDIR="${INCLUDEDIR}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# for SDCC-built firmware
 | 
				
			||||||
 | 
					[ -z "${HEXDIR}" ] && HEXDIR="${PREFIX}/share/firmware"
 | 
				
			||||||
 | 
					[ -z "${SDCC}" ] && SDCC="sdcc"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Get version information
 | 
					# Get version information
 | 
				
			||||||
| 
						 | 
					@ -239,7 +243,7 @@ build_target() {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    for item in ${ITEMS}
 | 
					    for item in ${ITEMS}
 | 
				
			||||||
    do
 | 
					    do
 | 
				
			||||||
        do_cmd source ${item} || return 1
 | 
					        do_cmd source ${item} || exit 1
 | 
				
			||||||
    done
 | 
					    done
 | 
				
			||||||
    return 0
 | 
					    return 0
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -10,7 +10,7 @@ then
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    echo "Building application ${@NAME@}..."
 | 
					    echo "Building application ${@NAME@}..."
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    source src/@NAME@/build.monolithic
 | 
					    do_cmd source src/@NAME@/build.monolithic || return 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    MODIFIED=0
 | 
					    MODIFIED=0
 | 
				
			||||||
    for test in ${MONOLITHIC_TESTS} ${SRC}
 | 
					    for test in ${MONOLITHIC_TESTS} ${SRC}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -14,7 +14,7 @@ then
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    echo "Building library ${@CNAME@}..."
 | 
					    echo "Building library ${@CNAME@}..."
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    source src/@NAME@/build.monolithic
 | 
					    do_cmd source src/@NAME@/build.monolithic || return 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    MODIFIED=0
 | 
					    MODIFIED=0
 | 
				
			||||||
    for test in ${MONOLITHIC_TESTS} ${HDR} ${SRC}
 | 
					    for test in ${MONOLITHIC_TESTS} ${HDR} ${SRC}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -10,7 +10,7 @@ then
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    echo "Building application ${@NAME@}..."
 | 
					    echo "Building application ${@NAME@}..."
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    source src/@NAME@/build.monolithic
 | 
					    do_cmd source src/@NAME@/build.monolithic || return 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    MODIFIED=0
 | 
					    MODIFIED=0
 | 
				
			||||||
    for test in ${MONOLITHIC_TESTS} ${SRC}
 | 
					    for test in ${MONOLITHIC_TESTS} ${SRC}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -14,7 +14,7 @@ then
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    echo "Building library ${@CNAME@}..."
 | 
					    echo "Building library ${@CNAME@}..."
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    source src/@NAME@/build.monolithic
 | 
					    do_cmd source src/@NAME@/build.monolithic || return 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    MODIFIED=0
 | 
					    MODIFIED=0
 | 
				
			||||||
    for test in ${MONOLITHIC_TESTS} ${HDR} ${SRC}
 | 
					    for test in ${MONOLITHIC_TESTS} ${HDR} ${SRC}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,10 +3,6 @@
 | 
				
			||||||
#  @NAME@_BUILT
 | 
					#  @NAME@_BUILT
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# HACK -- this should probably be in the top-level makefile
 | 
					 | 
				
			||||||
[ -z "${SDCC}" ] && SDCC=sdcc
 | 
					 | 
				
			||||||
[ -z "${SDCCFLAGS}" ] && SDCCFLAGS="@TODO@"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
if [ -z ${@NAME@_BUILT} ]
 | 
					if [ -z ${@NAME@_BUILT} ]
 | 
				
			||||||
then
 | 
					then
 | 
				
			||||||
    @NAME@="obj/@NAME@.hex"
 | 
					    @NAME@="obj/@NAME@.hex"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue