All pastes #2069438 Raw Edit

Someone

public diff v1 · immutable
#2069438 ·published 2011-05-26 12:54 UTC
rendered paste body
Index: build.prog.mk===================================================================--- build.prog.mk	(revision 900)+++ build.prog.mk	(working copy)@@ -135,17 +135,19 @@ _prog_objs: 	@if [ "${PROG}" != "" -a "${OBJS}" = "none" \ 	      -a "${SRCS}" != "none" ]; then \+	    FLIST=""; \ 	    for F in ${SRCS}; do \ 	        F=`echo $$F | sed 's/.[clym]$$/.o/'`; \ 	        F=`echo $$F | sed 's/.cc$$/.o/'`; \ 	        F=`echo $$F | sed 's/.cpp$$/.o/'`; \ 	        F=`echo $$F | sed 's/.asm$$/.o/'`; \-	        ${MAKE} $$F; \-		if [ $$? != 0 ]; then \-			echo "${MAKE}: failure"; \-			exit 1; \-		fi; \+		FLIST="$$FLIST $$F"; \ 	    done; \+	    ${MAKE} $$FLIST; \+	    if [ $$? != 0 ]; then \+	        echo "${MAKE}: failure"; \+		exit 1; \+	    fi; \ 	fi 	@if [ "${WINRES}" != "" -a "${WINDRES}" != "" ]; then \ 		echo "${WINDRES} -o ${WINRES}.o ${WINRES}"; \@@ -156,17 +158,19 @@ _prog_pobjs: 	@if [ "${GMONOUT}" != "" -a "${POBJS}" = "none" \ 	      -a "${SRCS}" != "none" ]; then \+	    FLIST=""; \ 	    for F in ${SRCS}; do \ 	        F=`echo $$F | sed 's/.[clym]$$/.po/'`; \ 	        F=`echo $$F | sed 's/.cc$$/.po/'`; \ 	        F=`echo $$F | sed 's/.cpp$$/.po/'`; \ 	        F=`echo $$F | sed 's/.asm$$/.po/'`; \-	        ${MAKE} $$F; \-		if [ $$? != 0 ]; then \-			echo "${MAKE}: failure"; \-			exit 1; \-		fi; \+		FLIST="$$FLIST $$F"; \ 	    done; \+	    ${MAKE} $$FLIST; \+	    if [ $$? != 0 ]; then \+	        echo "${MAKE}: failure"; \+	        exit 1; \+	    fi; \ 	fi  # Compile and link the programIndex: build.lib.mk===================================================================--- build.lib.mk	(revision 904)+++ build.lib.mk	(working copy)@@ -159,17 +159,19 @@ _lib_objs: 	@if [ "${LIB}" != "" -a "${OBJS}" = "none" -a "${SRCS}" != "none" \ 	      -a "${USE_LIBTOOL}" = "No" ]; then \+	    FLIST=""; \ 	    for F in ${SRCS}; do \ 	        F=`echo $$F | sed 's/.[clym]$$/.o/'`; \ 	        F=`echo $$F | sed 's/.cc$$/.o/'`; \ 	        F=`echo $$F | sed 's/.cpp$$/.o/'`; \ 	        F=`echo $$F | sed 's/.asm$$/.o/'`; \-	        ${MAKE} $$F; \-		if [ $$? != 0 ]; then \-			echo "${MAKE}: failure"; \-			exit 1; \-		fi; \+		FLIST="$$FLIST $$F"; \             done; \+	    ${MAKE} $$FLIST; \+	    if [ $$? != 0 ]; then \+	        echo "${MAKE}: failure"; \+	        exit 1; \+	    fi; \ 	fi 	@if [ "${WINRES}" != "" -a "${WINDRES}" != "" ]; then \ 		echo "${WINDRES} -o ${WINRES}.o ${WINRES}"; \@@ -180,17 +182,19 @@ _lib_shobjs: 	@if [ "${LIB}" != "" -a "${SHOBJS}" = "none" -a "${SRCS}" != "none" \ 	      -a "${USE_LIBTOOL}" = "Yes" ]; then \+	    FLIST=""; \ 	    for F in ${SRCS}; do \ 	        F=`echo $$F | sed 's/.[clym]$$/.lo/'`; \ 	        F=`echo $$F | sed 's/.cc$$/.lo/'`; \ 	        F=`echo $$F | sed 's/.cpp$$/.lo/'`; \ 	        F=`echo $$F | sed 's/.asm$$/.lo/'`; \-	        ${MAKE} $$F; \-		if [ $$? != 0 ]; then \-			echo "${MAKE}: failure"; \-			exit 1; \-		fi; \-            done; \+		FLIST="$$FLIST $$F"; \+	    done; \+	    ${MAKE} $$FLIST; \+	    if [ $$? != 0 ]; then \+	        echo "${MAKE}: failure"; \+	        exit 1; \+	    fi; \ 	fi  # Build a non-libtool version of the library.