Merge pull request #1910 from mstorsjo/make-simplify

Simplify handling of the default "all" rule

Makefile

@@ -29,9 +29,11 @@ PROJECT_NAME=openh264
 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 @@ CFLAGS += -fsanitize=address
 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 @@ endif
 
 #### 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 @@ COMMON_UNITTEST_CFLAGS += $(CODEC_UNITTEST_CFLAGS)
 
 .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 @@ endif
 
 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 @@ plugin: $(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIX)
 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
 

build/platform-android.mk

@@ -64,7 +64,7 @@ MODULE_INCLUDES = $(STL_INCLUDES)
 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_dec:
 clean_Android_enc:
 	-cd ./codec/build/android/enc && $(NDKROOT)/ndk-build APP_ABI=$(APP_ABI) clean && ant clean
 else
-all:
-	@:
 clean_Android:
 	@:
 endif

build/platform-msvc.mk

@@ -3,7 +3,4 @@ LDFLAGS += user32.lib
 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

codec/build/generate_codec_ver.sh

@@ -4,14 +4,14 @@
 #
 
 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
 
 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
 

test/encoder_binary_comparison/Scripts/run_BinarySHA1Comparison.sh

@@ -339,9 +339,9 @@ runOutputPassNum()
   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 ""
 }

test/encoder_binary_comparison/Scripts/run_BitStreamToYUV.sh

@@ -83,7 +83,7 @@ run_RegularizeYUVName()
   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
 }