[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openssl-cvs
Subject:    [CVS] OpenSSL: openssl/ Makefile.org Makefile.shared
From:       "Andy Polyakov" <appro () openssl ! org>
Date:       2008-12-30 13:20:17
Message-ID: 20081230132017.AF4D51EAE8A8 () master ! openssl ! org
[Download RAW message or body]

  OpenSSL CVS Repository
  http://cvs.openssl.org/
  ____________________________________________________________________________

  Server: cvs.openssl.org                  Name:   Andy Polyakov
  Root:   /v/openssl/cvs                   Email:  appro@openssl.org
  Module: openssl                          Date:   30-Dec-2008 14:20:17
  Branch: HEAD                             Handle: 2008123013201700

  Modified files:
    openssl                 Makefile.org Makefile.shared

  Log:
    Styling update to makefiles: eliminate redundant pipes.

  Summary:
    Revision    Changes     Path
    1.293       +1  -1      openssl/Makefile.org
    1.71        +2  -2      openssl/Makefile.shared
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openssl/Makefile.org
  ============================================================================
  $ cvs diff -u -r1.292 -r1.293 Makefile.org
  --- openssl/Makefile.org	29 Dec 2008 16:17:52 -0000	1.292
  +++ openssl/Makefile.org	30 Dec 2008 13:20:17 -0000	1.293
  @@ -225,7 +225,7 @@
   	    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
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openssl/Makefile.shared
  ============================================================================
  $ cvs diff -u -r1.70 -r1.71 Makefile.shared
  --- openssl/Makefile.shared	29 Dec 2008 16:17:52 -0000	1.70
  +++ openssl/Makefile.shared	30 Dec 2008 13:20:17 -0000	1.71
  @@ -93,7 +93,7 @@
     ( $(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 @@
       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} \
  @@ .
______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                     openssl-cvs@openssl.org
Automated List Manager                           majordomo@openssl.org


[prev in list] [next in list] [prev in thread] [next in thread]