Commit b3b201b6 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Styling update to makefiles: eliminate redundant pipes.

parent d41c785d

Makefile.org

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ BUILD_CMD= if [ -d "$$dir" ]; then \ 
	    fi

RECURSIVE_BUILD_CMD=for dir in $(DIRS); do $(BUILD_CMD); done

BUILD_ONE_CMD=\

	if echo " $(DIRS) " | grep " $$dir " >/dev/null 2>/dev/null; then \

	if expr " $(DIRS) " : ".* $$dir " >/dev/null 2>&1; then \

		$(BUILD_CMD); \

	fi

Makefile.shared

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ LINK_APP= \ 
  ( $(SET_X);   \

    LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \

    LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \

    LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \

    LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t;d' | uniq`; \

    LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \

    LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \

    $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} )
@@ -103,7 +103,7 @@ LINK_SO= \ 
    LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \

    SHAREDCMD="$${SHAREDCMD:-$(CC)}"; \

    SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \

    LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \

    LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t;d' | uniq`; \

    LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \

    LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \

    $${SHAREDCMD} $${SHAREDFLAGS} \