summaryrefslogtreecommitdiff
path: root/pjsip-apps/build/Samples.mak
diff options
context:
space:
mode:
Diffstat (limited to 'pjsip-apps/build/Samples.mak')
-rw-r--r--pjsip-apps/build/Samples.mak12
1 files changed, 8 insertions, 4 deletions
diff --git a/pjsip-apps/build/Samples.mak b/pjsip-apps/build/Samples.mak
index d9b4ddcd..839ce29c 100644
--- a/pjsip-apps/build/Samples.mak
+++ b/pjsip-apps/build/Samples.mak
@@ -11,7 +11,7 @@ export _LDFLAGS := $(PJ_LDFLAGS) $(PJ_LDLIBS) $(LDFLAGS)
SRCDIR := ../src/samples
OBJDIR := ./output/samples-$(TARGET_NAME)
-BINDIR := ../bin/samples
+BINDIR := ../bin/samples/$(TARGET_NAME)
SAMPLES := auddemo \
confsample \
@@ -37,11 +37,11 @@ SAMPLES := auddemo \
strerror \
tonegen
-EXES := $(foreach file, $(SAMPLES), $(BINDIR)/$(file)-$(TARGET_NAME)$(HOST_EXE))
+EXES := $(foreach file, $(SAMPLES), $(BINDIR)/$(file)$(HOST_EXE))
-all: $(OBJDIR) $(EXES)
+all: $(BINDIR) $(OBJDIR) $(EXES)
-$(BINDIR)/%-$(TARGET_NAME)$(HOST_EXE): $(OBJDIR)/%$(OBJEXT) $(PJ_LIB_FILES)
+$(BINDIR)/%$(HOST_EXE): $(OBJDIR)/%$(OBJEXT) $(PJ_LIB_FILES)
$(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$@) \
$(subst /,$(HOST_PSEP),$<) \
$(_LDFLAGS)
@@ -54,12 +54,16 @@ $(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.c
$(OBJDIR):
$(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR))
+$(BINDIR):
+ $(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR))
+
depend:
clean:
$(subst @@,$(subst /,$(HOST_PSEP),$(OBJDIR)/*),$(HOST_RMR))
$(subst @@,$(subst /,$(HOST_PSEP),$(OBJDIR)),$(HOST_RMDIR))
$(subst @@,$(EXES),$(HOST_RM))
+ rm -rf $(BINDIR)
distclean realclean: clean
# $(subst @@,$(subst /,$(HOST_PSEP),$(EXES)) $(subst /,$(HOST_PSEP),$(EXES)),$(HOST_RM))