From a60d5a09049ef15502c38a676f7791f0841828f8 Mon Sep 17 00:00:00 2001 From: soochoi Date: Tue, 7 Nov 2006 11:36:53 +0000 Subject: [PATCH] CASA: check in makefile for win32 --- .../windows/vs_solutions/CASA32-msi/Makefile.am | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/CASA/package/windows/vs_solutions/CASA32-msi/Makefile.am b/CASA/package/windows/vs_solutions/CASA32-msi/Makefile.am index 037e6e41..e268098f 100755 --- a/CASA/package/windows/vs_solutions/CASA32-msi/Makefile.am +++ b/CASA/package/windows/vs_solutions/CASA32-msi/Makefile.am @@ -64,18 +64,13 @@ all: $(MODULE_NAME).$(MODULE_EXT) vpath %.c $(PLATFORMDEPENDENTSOURCEDIR) $(PLATFORMINDEPENDENTSOURCEDIR) vpath %.cpp $(PLATFORMDEPENDENTSOURCEDIR) $(PLATFORMINDEPENDENTSOURCEDIR) - - $(MODULE_NAME).$(MODULE_EXT): $(SFILES) $(OBJDIR) devenv @echo [======== Updating msi and msm numbe ========] "$(TOOLDIR)/w32/VersionVDProj/bin/VersionVDProj.exe" -msi $(MSIFILE) version=$(VERSION) @echo [======== Building Solution $(SFILES) ========] "$(VSINSTALLDIR)\devenv" /rebuild $(TARGET_CFG) $(SFILES) /out build.log - cp -f $(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT) $(CASABINDIR) - cp -f $(TARGET_CFG)/setup.* $(CASABINDIR) - [ -d BUILT ] | mkdir -p BUILT - cp -p $(CASABINDIR)/setup.* BUILT - cp -p $(CASABINDIR)/CASA.msi BUILT + cp -f $(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT) ./BUILT + cp -f $(TARGET_CFG)/setup.exe ./BUILT tar -cvf $(PACKAGE)-$(VERSION).tar ./BUILT bzip2 -z $(PACKAGE)-$(VERSION).tar @@ -86,6 +81,7 @@ devenv: $(OBJDIR): [ -d $(OBJDIR) ] || mkdir -p $(OBJDIR) [ -d $(CASABINDIR) ] || mkdir -p $(CASABINDIR) + [ -d BUILT ] || mkdir -p BUILT install-exec-local: $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT)