shithub: openh264

Download patch

ref: f077d51f7e3f3118e73a09b586ac5f1a8354a13d
parent: 75251b5af76517375fef4785c1834812c589292e
author: Martin Storsjö <[email protected]>
date: Wed Apr 22 05:20:31 EDT 2015

Move the "all" make target before including any platform files

This makes sure that "all" stays as the default make target even if
platform makefiles add extra rules.

--- a/Makefile
+++ b/Makefile
@@ -60,6 +60,9 @@
 LDFLAGS += -fsanitize=address
 endif
 
+# Make sure the all target is the first one
+all: libraries binaries
+
 include $(SRC_PATH)build/platform-$(OS).mk
 
 
@@ -138,8 +141,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
--- a/build/platform-android.mk
+++ b/build/platform-android.mk
@@ -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