Module: sems Branch: master Commit: ecd37baa3abef768ed888a485f85b08bec8a959c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=ecd37baa3abef768ed888a485f85b08bec8a959c
Author: Stefan Sayer <[email protected]> Committer: Stefan Sayer <[email protected]> Date: Tue Aug 7 15:00:21 2012 +0200 c/f: make tests compile again --- core/tests/Makefile | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/core/tests/Makefile b/core/tests/Makefile index 5b79a9d..a274936 100644 --- a/core/tests/Makefile +++ b/core/tests/Makefile @@ -2,6 +2,8 @@ NAME=sems_tests SIP_STACK_DIR=../sip SIP_STACK=$(SIP_STACK_DIR)/sip_stack.a +RESAMPLE_DIR=../resample +LIBRESAMPLE=$(RESAMPLE_DIR)/libresample.a CORE_SRCS=$(filter-out ../sems.cpp , $(wildcard ../*.cpp)) CORE_HDRS=$(CORE_SRCS:.cpp=.h) CORE_OBJS=$(CORE_SRCS:.cpp=.o) @@ -17,7 +19,7 @@ CPPFLAGS += -I.. -DNOMAIN EXTRA_LDFLAGS += -lresolv .PHONY: all -all: ../../Makefile.defs +all: ../../Makefile.defs sip_stack libresample -@$(MAKE) core_deps && $(MAKE) deps && \ $(MAKE) $(NAME) && \ ./$(NAME) @@ -28,6 +30,12 @@ sip_stack: -@echo "making SIP stack" -@cd $(SIP_STACK_DIR); $(MAKE) all +.PHONY: libresample +libresample: + -@echo "" + -@echo "making libresample" + -@cd $(RESAMPLE_DIR); $(MAKE) all + SIP_STACK: sip_stack .PHONY: clean @@ -53,10 +61,10 @@ include ../../Makefile.defs %.d : ../%.cpp ../%.h ../../Makefile.defs $(CXX) -MM $< $(CPPFLAGS) $(CXXFLAGS) > $@ -$(NAME): $(OBJS) $(CORE_OBJS) $(SIP_STACK) ../../Makefile.defs +$(NAME): $(OBJS) $(CORE_OBJS) $(SIP_STACK) $(LIBRESAMPLE) ../../Makefile.defs -@echo "" -@echo "making $(NAME)" - $(LD) -o $(NAME) $(OBJS) $(CORE_OBJS) $(SIP_STACK) $(LDFLAGS) $(EXTRA_LDFLAGS) + $(LD) -o $(NAME) $(OBJS) $(CORE_OBJS) $(SIP_STACK) $(LIBRESAMPLE) $(LDFLAGS) $(EXTRA_LDFLAGS) ifeq '$(NAME)' '$(MAKECMDGOALS)' _______________________________________________ Semsdev mailing list [email protected] http://lists.iptel.org/mailman/listinfo/semsdev
