Changeset 2669


Ignore:
Timestamp:
May 1, 2009 10:05:13 AM (10 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:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip-apps/build/Samples-vc.mak

    r2664 r2669  
    5656SRCDIR = ..\src\samples 
    5757OBJDIR = .\output\samples-$(TARGET) 
    58 BINDIR = ..\bin\samples 
     58BINDIR = ..\bin\samples\$(TARGET) 
    5959 
    6060 
     
    8585 
    8686 
    87 all: $(OBJDIR) $(SAMPLES) 
     87all: $(BINDIR) $(OBJDIR) $(SAMPLES) 
    8888 
    8989$(SAMPLES): $(SRCDIR)\$(@B).c $(LIBS) $(SRCDIR)\util.h Samples-vc.mak 
    9090        cl -nologo -c $(SRCDIR)\$(@B).c /Fo$(OBJDIR)\$(@B).obj $(CFLAGS)  
    91         cl /nologo $(OBJDIR)\$(@B).obj /Fe$(BINDIR)\$(@B)-$(TARGET).exe /Fm$(OBJDIR)\$(@B).map $(LDFLAGS) 
     91        cl /nologo $(OBJDIR)\$(@B).obj /Fe$@ /Fm$(OBJDIR)\$(@B).map $(LDFLAGS) 
    9292        @rem the following two lines is just for cleaning up the 'bin' directory 
    93         if exist $(BINDIR)\*$(TARGET).ilk del /Q $(BINDIR)\*$(TARGET).ilk 
    94         if exist $(BINDIR)\*$(TARGET).pdb del /Q $(BINDIR)\*$(TARGET).pdb 
     93        if exist $(BINDIR)\*.ilk del /Q $(BINDIR)\*.ilk 
     94        if exist $(BINDIR)\*.pdb del /Q $(BINDIR)\*.pdb 
     95 
     96$(BINDIR): 
     97        if not exist $(BINDIR) mkdir $(BINDIR) 
    9598 
    9699$(OBJDIR): 
     
    99102clean: 
    100103        echo Cleaning up samples... 
    101         if exist $(BINDIR) del /Q $(BINDIR)\*$(TARGET).* 
     104        if exist $(BINDIR) del /Q $(BINDIR)\* 
     105        if exist $(BINDIR) rmdir $(BINDIR) 
    102106        if exist $(OBJDIR) del /Q $(OBJDIR)\*.* 
    103107 
  • pjproject/trunk/pjsip-apps/build/Samples.mak

    r2592 r2669  
    1212SRCDIR := ../src/samples 
    1313OBJDIR := ./output/samples-$(TARGET_NAME) 
    14 BINDIR := ../bin/samples 
     14BINDIR := ../bin/samples/$(TARGET_NAME) 
    1515 
    1616SAMPLES := auddemo \ 
     
    3838           tonegen 
    3939 
    40 EXES := $(foreach file, $(SAMPLES), $(BINDIR)/$(file)-$(TARGET_NAME)$(HOST_EXE)) 
     40EXES := $(foreach file, $(SAMPLES), $(BINDIR)/$(file)$(HOST_EXE)) 
    4141 
    42 all: $(OBJDIR) $(EXES) 
     42all: $(BINDIR) $(OBJDIR) $(EXES) 
    4343 
    44 $(BINDIR)/%-$(TARGET_NAME)$(HOST_EXE): $(OBJDIR)/%$(OBJEXT) $(PJ_LIB_FILES) 
     44$(BINDIR)/%$(HOST_EXE): $(OBJDIR)/%$(OBJEXT) $(PJ_LIB_FILES) 
    4545        $(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$@) \ 
    4646            $(subst /,$(HOST_PSEP),$<) \ 
     
    5555        $(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR))  
    5656 
     57$(BINDIR): 
     58        $(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR))  
     59 
    5760depend: 
    5861 
     
    6164        $(subst @@,$(subst /,$(HOST_PSEP),$(OBJDIR)),$(HOST_RMDIR)) 
    6265        $(subst @@,$(EXES),$(HOST_RM)) 
     66        rm -rf $(BINDIR) 
    6367 
    6468distclean realclean: clean 
Note: See TracChangeset for help on using the changeset viewer.