Changeset 2669 for pjproject/trunk/pjsip-apps/build/Samples.mak

Timestamp:

May 1, 2009 10:05:13 AM (16 years ago)

Author:

bennylp

Message:

Ticket #810 and part of #706: changed samples output directory to bin/samples/$TARGET

File:

• pjproject/trunk/pjsip-apps/build/Samples.mak (modified) (4 diffs)

pjproject/trunk/pjsip-apps/build/Samples.mak

@@ -12 +12 @@
 SRCDIR := ../src/samples
 OBJDIR := ./output/samples-$(TARGET_NAME)
-BINDIR := ../bin/samples
+BINDIR := ../bin/samples/$(TARGET_NAME)
 
 SAMPLES := auddemo \
@@ -38 +38 @@
            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),$<) \
@@ -55 +55 @@
         $(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR)) 
 
+$(BINDIR):
+        $(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR)) 
+
 depend:
 
@@ -61 +64 @@
         $(subst @@,$(subst /,$(HOST_PSEP),$(OBJDIR)),$(HOST_RMDIR))
         $(subst @@,$(EXES),$(HOST_RM))
+        rm -rf $(BINDIR)
 
 distclean realclean: clean