Changeset 2669

Timestamp:

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

Author:

bennylp

Message:

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

Location:

pjproject/trunk/pjsip-apps/build

Files:

• Samples-vc.mak (modified) (3 diffs)
• Samples.mak (modified) (4 diffs)

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

@@ -56 +56 @@
 SRCDIR = ..\src\samples
 OBJDIR = .\output\samples-$(TARGET)
-BINDIR = ..\bin\samples
+BINDIR = ..\bin\samples\$(TARGET)
 
 
@@ -85 +85 @@
 
 
-all: $(OBJDIR) $(SAMPLES)
+all: $(BINDIR) $(OBJDIR) $(SAMPLES)
 
 $(SAMPLES): $(SRCDIR)\$(@B).c $(LIBS) $(SRCDIR)\util.h Samples-vc.mak
         cl -nologo -c $(SRCDIR)\$(@B).c /Fo$(OBJDIR)\$(@B).obj $(CFLAGS) 
-        cl /nologo $(OBJDIR)\$(@B).obj /Fe$(BINDIR)\$(@B)-$(TARGET).exe /Fm$(OBJDIR)\$(@B).map $(LDFLAGS)
+        cl /nologo $(OBJDIR)\$(@B).obj /Fe$@ /Fm$(OBJDIR)\$(@B).map $(LDFLAGS)
         @rem the following two lines is just for cleaning up the 'bin' directory
-        if exist $(BINDIR)\*$(TARGET).ilk del /Q $(BINDIR)\*$(TARGET).ilk
-        if exist $(BINDIR)\*$(TARGET).pdb del /Q $(BINDIR)\*$(TARGET).pdb
+        if exist $(BINDIR)\*.ilk del /Q $(BINDIR)\*.ilk
+        if exist $(BINDIR)\*.pdb del /Q $(BINDIR)\*.pdb
+
+$(BINDIR):
+        if not exist $(BINDIR) mkdir $(BINDIR)
 
 $(OBJDIR):
@@ -99 +102 @@
 clean:
         echo Cleaning up samples...
-        if exist $(BINDIR) del /Q $(BINDIR)\*$(TARGET).*
+        if exist $(BINDIR) del /Q $(BINDIR)\*
+        if exist $(BINDIR) rmdir $(BINDIR)
         if exist $(OBJDIR) del /Q $(OBJDIR)\*.*
 

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