From c72920f8837a83cc2c4ce0c241fc89f9d7957d8e Mon Sep 17 00:00:00 2001 From: Liong Sauw Ming Date: Thu, 16 Jan 2014 06:33:19 +0000 Subject: Re #1723: Fixed compilation and linking errors git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4705 74dad513-b988-da41-8d7b-12977e46ad98 --- pjsip-apps/build/Samples.mak | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'pjsip-apps') diff --git a/pjsip-apps/build/Samples.mak b/pjsip-apps/build/Samples.mak index 6e9ca386..65d25b9f 100644 --- a/pjsip-apps/build/Samples.mak +++ b/pjsip-apps/build/Samples.mak @@ -29,6 +29,7 @@ SAMPLES := auddemo \ mix \ pjsip-perf \ pcaputil \ + pjsua2_demo \ playfile \ playsine \ recfile \ @@ -48,20 +49,12 @@ SAMPLES := auddemo \ EXES := $(foreach file, $(SAMPLES), $(file)$(HOST_EXE)) -PJSUA2_SAMPLES := pjsua2_demo - -PJSUA2_EXES := $(foreach file, $(PJSUA2_SAMPLES), $(file)$(HOST_EXE)) - .PHONY: $(EXES) -.PHONY: $(PJSUA2_EXES) -all: $(EXES) $(PJSUA2_EXES) +all: $(EXES) $(EXES): - $(MAKE) --no-print-directory -f $(RULES_MAK) SAMPLE_SRCDIR=$(SRCDIR) SAMPLE_OBJS=$@.o SAMPLE_CFLAGS="$(_CFLAGS)" SAMPLE_LDFLAGS="$(_LDFLAGS)" SAMPLE_EXE=$@ APP=SAMPLE app=sample $(subst /,$(HOST_PSEP),$(BINDIR)/$@) - -$(PJSUA2_EXES): - $(MAKE) --no-print-directory -f $(RULES_MAK) SAMPLE_SRCDIR=$(SRCDIR) SAMPLE_OBJS=$@.o SAMPLE_CFLAGS="$(_CFLAGS)" SAMPLE_LDFLAGS="$(_LDFLAGS) -lstdc++" SAMPLE_EXE=$@ APP=SAMPLE app=sample $(subst /,$(HOST_PSEP),$(BINDIR)/$@) + $(MAKE) --no-print-directory -f $(RULES_MAK) SAMPLE_SRCDIR=$(SRCDIR) SAMPLE_OBJS=$@.o SAMPLE_CFLAGS="$(_CFLAGS)" SAMPLE_CXXFLAGS="$(_CXXFLAGS)" SAMPLE_LDFLAGS="$(_LDFLAGS) -lstdc++" SAMPLE_EXE=$@ APP=SAMPLE app=sample $(subst /,$(HOST_PSEP),$(BINDIR)/$@) depend: -- cgit v1.2.3