Commit adaff9f3 authored by fbarchard@google.com's avatar fbarchard@google.com

rename Makefile to avoid name clash with gclient runhooks

BUG=none
TEST=none
R=wuwang@google.com

Review URL: https://webrtc-codereview.appspot.com/4079005

git-svn-id: http://libyuv.googlecode.com/svn/trunk@869 16f28f9a-4ce2-e073-06de-1de4eb20be90
parent 2d882407
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 866 Version: 869
License: BSD License: BSD
License File: LICENSE License File: LICENSE
......
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 866 #define LIBYUV_VERSION 869
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
# This is a generic makefile for libyuv for gcc. # This is a generic makefile for libyuv for gcc.
# Caveat: This file will get overwritten by GYP if projects are generated # make -f linux.mk CC=clang++
# with GYP_GENERATORS=make
CC=g++ CC=g++
CCFLAGS=-O2 -fomit-frame-pointer -Iinclude/ CCFLAGS=-O2 -fomit-frame-pointer -Iinclude/
...@@ -34,13 +33,13 @@ LOCAL_OBJ_FILES := \ ...@@ -34,13 +33,13 @@ LOCAL_OBJ_FILES := \
.cc.o: .cc.o:
$(CC) -c $(CCFLAGS) $*.cc -o $*.o $(CC) -c $(CCFLAGS) $*.cc -o $*.o
all: libyuv.a convert Makefile all: libyuv.a convert linux.mk
libyuv.a: $(LOCAL_OBJ_FILES) Makefile libyuv.a: $(LOCAL_OBJ_FILES) linux.mk
$(AR) $(ARFLAGS) -o $@ $(LOCAL_OBJ_FILES) $(AR) $(ARFLAGS) -o $@ $(LOCAL_OBJ_FILES)
# A test utility that uses libyuv conversion. # A test utility that uses libyuv conversion.
convert: util/convert.cc Makefile convert: util/convert.cc linux.mk
$(CC) $(CCFLAGS) -Iutil/ -o $@ util/convert.cc libyuv.a $(CC) $(CCFLAGS) -Iutil/ -o $@ util/convert.cc libyuv.a
clean: clean:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment