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.
This commit is contained in:
Martin Storsjö 2015-04-22 09:20:31 +03:00
parent 75251b5af7
commit f077d51f7e
3 changed files with 3 additions and 7 deletions

View File

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

View File

@ -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

View File

@ -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