shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #1910 from mstorsjo/make-simplify

Simplify handling of the default "all" rule

--- a/Makefile

+++ b/Makefile

@@ -29,9 +29,11 @@

 MODULE_NAME=gmpopenh264

 GMP_API_BRANCH=Firefox39

 CCASFLAGS=$(CFLAGS)

-VERSION=1.4

 STATIC_LDFLAGS=-lstdc++

+VERSION=1.4

+SHAREDLIBVERSION=0

+

 ifeq (,$(wildcard $(SRC_PATH)gmp-api))

 HAVE_GMP_API=No

 else

@@ -58,7 +60,9 @@

 LDFLAGS += -fsanitize=address

 endif

-SHAREDLIBVERSION=0

+# Make sure the all target is the first one

+all: libraries binaries

+

 include $(SRC_PATH)build/platform-$(OS).mk

@@ -72,13 +76,13 @@

 #### No user-serviceable parts below this line

 ifneq ($(V),Yes)

-    QUIET_CXX = @printf "CXX\t$@\n";

-    QUIET_CC  = @printf "CC\t$@\n";

+    QUIET_CXX  = @printf "CXX\t$@\n";

+    QUIET_CC   = @printf "CC\t$@\n";

     QUIET_CCAS = @printf "CCAS\t$@\n";

-    QUIET_ASM = @printf "ASM\t$@\n";

-    QUIET_AR  = @printf "AR\t$@\n";

-    QUIET_RC  = @printf "RC\t$@\n";

-    QUIET     = @

+    QUIET_ASM  = @printf "ASM\t$@\n";

+    QUIET_AR   = @printf "AR\t$@\n";

+    QUIET_RC   = @printf "RC\t$@\n";

+    QUIET      = @

 endif

@@ -138,8 +142,6 @@

 .PHONY: test gtest-bootstrap clean $(PROJECT_NAME).pc $(PROJECT_NAME)-static.pc

-all: libraries binaries

-

 generate-version:

 	$(QUIET)cd $(SRC_PATH) && sh ./codec/common/generate_version.sh

@@ -176,7 +178,7 @@

 else

 test:

-	@echo "./gtest : No such file or directory."

+	@echo "./gtest: No such file or directory."

 	@echo "You do not have gtest. Run make gtest-bootstrap to get gtest"

 endif

@@ -226,7 +228,7 @@

 LIBRARIES += $(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIXVER)

 else

 plugin:

-	@echo "./gmp-api : No such file or directory."

+	@echo "./gmp-api: No such file or directory."

 	@echo "You do not have gmp-api.  Run make gmp-bootstrap to get the gmp-api headers."

 endif

--- a/build/platform-android.mk

+++ b/build/platform-android.mk

@@ -64,7 +64,7 @@

 MODULE_LDFLAGS = $(STL_LIB)

 ifeq (./,$(SRC_PATH))

-binaries : decdemo encdemo

+binaries: decdemo encdemo

 decdemo: libraries

 	cd ./codec/build/android/dec && $(NDKROOT)/ndk-build -B APP_ABI=$(APP_ABI) && android update project -t $(TARGET) -p . && ant debug

@@ -79,8 +79,6 @@

 clean_Android_enc:

 	-cd ./codec/build/android/enc && $(NDKROOT)/ndk-build APP_ABI=$(APP_ABI) clean && ant clean

 else

-all:

-	@:

 clean_Android:

 	@:

 endif

--- a/build/platform-msvc.mk

+++ b/build/platform-msvc.mk

@@ -3,7 +3,4 @@

 CFLAGS_OPT += -MT

 CFLAGS_DEBUG += -MTd -Gm

-# Make sure a plain "make" without a target still builds "all"

-all:

-

 $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXVER): openh264.res

--- a/codec/build/generate_codec_ver.sh

+++ b/codec/build/generate_codec_ver.sh

@@ -4,7 +4,7 @@

 #

 if [ "$1"x = ""x ]; then

-	echo "Please input the version number as : major_ver.minor_ver.patch.reserve"

+	echo "Please input the version number as: major_ver.minor_ver.patch.reserve"

 	exit 127

 fi

@@ -11,7 +11,7 @@

 codec_ver=`echo "$1" | egrep  "^([0-9]+[.]){3}[0-9]+$"`

 if [ $? -ne 0 ]; then

-	echo "Please input the version number as : major_ver.minor_ver.patch.reserve"

+	echo "Please input the version number as: major_ver.minor_ver.patch.reserve"

 	exit 127

 fi

--- a/test/encoder_binary_comparison/Scripts/run_BinarySHA1Comparison.sh

+++ b/test/encoder_binary_comparison/Scripts/run_BinarySHA1Comparison.sh

@@ -339,9 +339,9 @@

   echo ""

   echo "***********************************************************"

   echo "${TestSequenceName}"

-  echo "total case  Num is :  ${TotalCaseNum}"

-  echo "pass  case  Num is : ${PassCaseNum}"

-  echo "unpass case Num is : ${UnpassCaseNum} "

+  echo "total case  Num is: ${TotalCaseNum}"

+  echo "pass  case  Num is: ${PassCaseNum}"

+  echo "unpass case Num is: ${UnpassCaseNum}"

   echo "***********************************************************"

   echo ""

 }

--- a/test/encoder_binary_comparison/Scripts/run_BitStreamToYUV.sh

+++ b/test/encoder_binary_comparison/Scripts/run_BitStreamToYUV.sh

@@ -83,7 +83,7 @@

   RegularizedYUVName="${BitStreamName}_${aDecodedYUVInfo[0]}x${aDecodedYUVInfo[1]}.yuv"

   mv -f  ${OrignName}   ${RegularizedYUVName}

   echo ""

-  echo "file :  ${OrignName}   has been renamed as :${RegularizedYUVName}"

+  echo "file: ${OrignName}   has been renamed as: ${RegularizedYUVName}"

   echo ""

   return 0

 }