diff --git a/daemon/Makefile b/daemon/Makefile index 46c9f5f2e..3b7b34a02 100644 --- a/daemon/Makefile +++ b/daemon/Makefile @@ -6,17 +6,10 @@ include ../lib/deps.Makefile with_transcoding ?= yes -ifeq ($(origin CFLAGS),undefined) -CFLAGS:= -g -Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -Wstrict-prototypes -Werror=return-type \ - -Wshadow -else -CFLAGS:= $(CFLAGS) -endif -CFLAGS+= -pthread -CFLAGS+= -std=c11 +include ../lib/flags.Makefile + CFLAGS+= -I. -I../kernel-module/ -I../lib/ -I../include/ CFLAGS+= -Iprivate -CFLAGS+= -D_GNU_SOURCE CFLAGS+= $(CFLAGS_GLIB) CFLAGS+= $(CFLAGS_GTHREAD) CFLAGS+= $(CFLAGS_LIBZ) @@ -35,7 +28,6 @@ CFLAGS+= $(CFLAGS_LIBSWRESAMPLE) CFLAGS+= $(CFLAGS_LIBAVFILTER) CFLAGS+= $(CFLAGS_SPANDSP) CFLAGS+= $(CFLAGS_OPUS) -CFLAGS+= -DWITH_TRANSCODING CFLAGS+= $(CFLAGS_MYSQL) else CFLAGS+= -DWITHOUT_CODECLIB @@ -48,7 +40,6 @@ endif #CFLAGS+= -DSRTCP_KEY_DERIVATION_RFC_COMPLIANCE #CFLAGS+= -DSTRICT_SDES_KEY_LIFETIME -LDLIBS:= -lm -ldl LDLIBS+= $(LDLIBS_GLIB) LDLIBS+= $(LDLIBS_GTHREAD) LDLIBS+= $(LDLIBS_LIBZ) diff --git a/lib/common.Makefile b/lib/common.Makefile index 06078bccb..791ebb019 100644 --- a/lib/common.Makefile +++ b/lib/common.Makefile @@ -2,10 +2,6 @@ include ../lib/lib.Makefile -CFLAGS += -fPIE -LDFLAGS += -pie -LDLIBS += -latomic - all: $(TARGET) $(MANS) diff --git a/lib/flags.Makefile b/lib/flags.Makefile new file mode 100644 index 000000000..52fdd154b --- /dev/null +++ b/lib/flags.Makefile @@ -0,0 +1,22 @@ +with_transcoding ?= yes + +ifeq ($(origin CFLAGS),undefined) +CFLAGS := -g -Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -Wstrict-prototypes -Werror=return-type \ + -Wshadow +else +CFLAGS := $(CFLAGS) +endif + +CFLAGS += -I. -I$(top_srcdir)/kernel-module/ -I$(top_srcdir)/lib/ +CFLAGS += -pthread +CFLAGS += -std=c11 +CFLAGS += -D_GNU_SOURCE -D_POSIX_SOURCE -D_POSIX_C_SOURCE +CFLAGS += -fPIE + +ifeq ($(with_transcoding),yes) +CFLAGS += -DWITH_TRANSCODING +endif + +LDFLAGS += -pie + +LDLIBS := -lm -ldl -latomic diff --git a/perf-tester/Makefile b/perf-tester/Makefile index a84dc4c67..3af982e2e 100644 --- a/perf-tester/Makefile +++ b/perf-tester/Makefile @@ -6,17 +6,9 @@ include ../lib/deps.Makefile FIXTURES_PATH ?= ../fixtures -ifeq ($(origin CFLAGS),undefined) -CFLAGS ?= -g -Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -Wstrict-prototypes -Werror=return-type \ - -Wshadow -else -CFLAGS := $(CFLAGS) -endif +include ../lib/flags.Makefile -CFLAGS += -pthread -CFLAGS += -std=c11 CFLAGS += -I. -I../kernel-module/ -I../lib/ -CFLAGS += -D_GNU_SOURCE CFLAGS += -DFIXTURES_PATH="\"$(FIXTURES_PATH)\"" CFLAGS += -DWITH_TRANSCODING CFLAGS += $(CFLAGS_LIBPCRE) @@ -33,7 +25,6 @@ CFLAGS += $(CFLAGS_OPUS) CFLAGS += $(CFLAGS_NCURSESW) CFLAGS += $(CFLAGS_OPENSSL) -LDLIBS := -lm -ldl LDLIBS += $(LDLIBS_GLIB) LDLIBS += $(LDLIBS_JSON_GLIB) LDLIBS += $(LDLIBS_GTHREAD) diff --git a/recording-daemon/Makefile b/recording-daemon/Makefile index 6d121fb27..da08aa4e3 100644 --- a/recording-daemon/Makefile +++ b/recording-daemon/Makefile @@ -4,16 +4,9 @@ export top_srcdir = .. include ../lib/deps.Makefile -ifeq ($(origin CFLAGS),undefined) -CFLAGS?= -g -Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -Wstrict-prototypes -Werror=return-type \ - -Wshadow -else -CFLAGS:= $(CFLAGS) -endif -CFLAGS+= -pthread -CFLAGS+= -std=c11 +include ../lib/flags.Makefile + CFLAGS+= -I. -I../lib/ -I../kernel-module/ -CFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE -D_POSIX_C_SOURCE CFLAGS+= $(CFLAGS_LIBPCRE) CFLAGS+= $(CFLAGS_GLIB) CFLAGS+= $(CFLAGS_JSON_GLIB) @@ -29,7 +22,6 @@ CFLAGS+= $(CFLAGS_OPENSSL) CFLAGS+= $(CFLAGS_LIBCURL) CFLAGS+= $(CFLAGS_LIBJWT) -LDLIBS:= -lm -ldl LDLIBS+= $(LDLIBS_GLIB) LDLIBS+= $(LDLIBS_JSON_GLIB) LDLIBS+= $(LDLIBS_GTHREAD) diff --git a/t/Makefile b/t/Makefile index 7ba2776d6..dfe1fe11d 100644 --- a/t/Makefile +++ b/t/Makefile @@ -6,17 +6,11 @@ include ../lib/deps.Makefile with_transcoding ?= yes -ifeq ($(origin CFLAGS),undefined) -CFLAGS?= -g -Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -Wstrict-prototypes -Werror=return-type \ - -Wshadow -else -CFLAGS:= $(CFLAGS) -endif +include ../lib/flags.Makefile + PRELOAD_CFLAGS := $(CFLAGS) -CFLAGS+= -pthread -CFLAGS+= -std=c11 + CFLAGS+= -I. -I../lib/ -I../kernel-module/ -I../include/ -CFLAGS+= -D_GNU_SOURCE CFLAGS+= $(CFLAGS_GLIB) CFLAGS+= $(CFLAGS_GTHREAD) CFLAGS+= $(CFLAGS_OPENSSL) @@ -43,7 +37,6 @@ else CFLAGS+= -DWITHOUT_CODECLIB endif -LDLIBS:= -lm -ldl LDLIBS+= $(LDLIBS_GLIB) LDLIBS+= $(LDLIBS_GTHREAD) LDLIBS+= $(LDLIBS_LIBCRYPTO)