From: George Joseph Date: Mon, 9 Dec 2024 19:54:53 +0000 (-0700) Subject: Allow C++ source files (as extension .cc) in the main directory X-Git-Tag: 21.7.0-rc1~38 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb8b91386a6e5f45abe16e30950dde6797216529;p=thirdparty%2Fasterisk.git Allow C++ source files (as extension .cc) in the main directory Although C++ files (as extension .cc) have been handled in the module directories for many years, the main directory was missing one line in its Makefile that prevented C++ files from being recognised there. (cherry picked from commit ab820f612152d85102837e9d2d63c49242e8999e) --- diff --git a/main/Makefile b/main/Makefile index 297391746e..e6aa7acece 100644 --- a/main/Makefile +++ b/main/Makefile @@ -31,7 +31,8 @@ ifeq ($(PJPROJECT_BUNDLED),yes) SRC:=$(filter-out libasteriskpj.c,$(SRC)) endif OBJSFILTER:=$(MOD_OBJS) fskmodem_int.o fskmodem_float.o cygload.o buildinfo.o -OBJS=$(filter-out $(OBJSFILTER),$(SRC:.c=.o)) +SRC_CC:=$(wildcard *.cc) +OBJS=$(filter-out $(OBJSFILTER),$(SRC:.c=.o) $(SRC_CC:.cc=.oo)) # we need to link in the objects statically, not as a library, because # otherwise modules will not have them available if none of the static