From 8c9d1d1add63408de737f8072710de68ccb385af Mon Sep 17 00:00:00 2001 From: Marcin Miklas Date: Wed, 5 May 2021 14:23:27 +0200 Subject: CASBMWG21-2812 ATL should not be default --- Makefile | 6 +++--- lib/avtp_pipeline/avtp_pipeline.mk | 4 ++-- lib/common/Makefile | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index f31b002a..af129354 100644 --- a/Makefile +++ b/Makefile @@ -125,7 +125,7 @@ live_stream: live_stream_clean: $(call descend,examples/live_stream/,clean) -avtp_pipeline: lib atl_lib +avtp_pipeline: lib $(MAKE) -s -C lib/avtp_pipeline -f avtp_pipeline.mk avtp_pipeline_clean: @@ -149,8 +149,8 @@ examples_all: examples_common simple_talker simple_listener mrp_client live_stre examples_all_clean: examples_common_clean simple_talker_clean simple_listener_clean mrp_client_clean \ jackd-talker_clean jackd-listener_clean live_stream_clean simple_rx_clean -all: lib atl_lib daemons_all examples_all avtp_pipeline avtp_avdecc +all: lib daemons_all examples_all avtp_pipeline avtp_avdecc -clean: lib_clean atl_lib_clean daemons_all_clean examples_all_clean avtp_pipeline_clean avtp_avdecc_clean +clean: lib_clean daemons_all_clean examples_all_clean avtp_pipeline_clean avtp_avdecc_clean .PHONY: FORCE diff --git a/lib/avtp_pipeline/avtp_pipeline.mk b/lib/avtp_pipeline/avtp_pipeline.mk index 6e9565ca..ab445d26 100644 --- a/lib/avtp_pipeline/avtp_pipeline.mk +++ b/lib/avtp_pipeline/avtp_pipeline.mk @@ -1,8 +1,8 @@ AVB_FEATURE_ENDPOINT ?= 1 IGB_LAUNCHTIME_ENABLED ?= 0 -ATL_LAUNCHTIME_ENABLED ?= 1 +ATL_LAUNCHTIME_ENABLED ?= 0 AVB_FEATURE_GSTREAMER ?= 0 -PLATFORM_TOOLCHAIN ?= x86_aqc_linux +PLATFORM_TOOLCHAIN ?= generic .PHONY: all clean diff --git a/lib/common/Makefile b/lib/common/Makefile index 085f77e0..e6676dfd 100644 --- a/lib/common/Makefile +++ b/lib/common/Makefile @@ -1,5 +1,5 @@ AVB_FEATURE_IGB ?= 1 -AVB_FEATURE_ATL ?= 1 +AVB_FEATURE_ATL ?= 0 ifeq ($(AVB_FEATURE_IGB),1) AVB_IGB_OBJ = avb_igb.o -- cgit v1.2.1