From 5b8f57d9c0fd381dd72eb8808143afa30b8a71b1 Mon Sep 17 00:00:00 2001
From: soochoi <soochoi@unknown>
Date: Wed, 8 Nov 2006 06:13:32 +0000
Subject: [PATCH] CASA: changes in windows makefile -continue

---
 .../vs_solutions/CASA32-msi/Makefile.am       | 12 +++++------
 .../vs_solutions/CASA64-msi/Makefile.am       | 21 ++++++++++---------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/CASA/package/windows/vs_solutions/CASA32-msi/Makefile.am b/CASA/package/windows/vs_solutions/CASA32-msi/Makefile.am
index e268098f..d2d879cf 100755
--- a/CASA/package/windows/vs_solutions/CASA32-msi/Makefile.am
+++ b/CASA/package/windows/vs_solutions/CASA32-msi/Makefile.am
@@ -47,6 +47,8 @@ export MONO_PATH := $(MONO_PATH)
 PLATFORMINDEPENDENTSOURCEDIR = .. 
 PLATFORMDEPENDENTSOURCEDIR = .
 
+OBJDIR = ./BUILT
+
 MODULE_NAME =CASA
 MODULE_EXT =msi
 
@@ -69,9 +71,9 @@ $(MODULE_NAME).$(MODULE_EXT): $(SFILES) $(OBJDIR) devenv
 	"$(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) ./BUILT 
-	cp -f $(TARGET_CFG)/setup.exe ./BUILT 
-	tar -cvf $(PACKAGE)-$(VERSION).tar ./BUILT
+	cp -f $(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT) $(OBJDIR) 
+	cp -f $(TARGET_CFG)/setup.exe $(OBJDIR) 
+	tar -cvf $(PACKAGE)-$(VERSION).tar $(OBJDIR) 
 	bzip2 -z $(PACKAGE)-$(VERSION).tar
 
 	
@@ -80,8 +82,6 @@ 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)
@@ -103,7 +103,7 @@ clean-local:
 	if [ -d $(TARGET_CFG) ]; then  rm -rf $(TARGET_CFG); fi
 	if [ -d Debug ]; then  rm -rf Debug; fi
 	if [ -f build.log ]; then  rm -f build.log; fi
-	if [ -d BUILT ]; then rm -rf BUILT; fi
+	if [ -d $(OBJDIR) ]; then rm -rf $(OBJDIR); fi
 	if [ -f $(PACKAGE)-$(VERSION).tar.bz2 ]; then rm -f $(PACKAGE)-$(VERSION).tar.bz2; fi
 distclean-local:
 
diff --git a/CASA/package/windows/vs_solutions/CASA64-msi/Makefile.am b/CASA/package/windows/vs_solutions/CASA64-msi/Makefile.am
index 378373a6..0aa5d12d 100644
--- a/CASA/package/windows/vs_solutions/CASA64-msi/Makefile.am
+++ b/CASA/package/windows/vs_solutions/CASA64-msi/Makefile.am
@@ -47,6 +47,8 @@ export MONO_PATH := $(MONO_PATH)
 PLATFORMINDEPENDENTSOURCEDIR = .. 
 PLATFORMDEPENDENTSOURCEDIR = .
 
+OBJDIR = ../BUILT
+
 MODULE_NAME =CASA_x64
 MODULE_EXT =msi
 
@@ -71,11 +73,11 @@ $(MODULE_NAME).$(MODULE_EXT): $(SFILES) $(OBJDIR) devenv
 	"$(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) ../BUILT/bin64 
-	cp -f $(TARGET_CFG)/setup.exe ../BUILT/bin64 
-	cp -p ../CASA32-msi/$(TARGET_CFG)/setup.exe ../BUILT/bin
-	cp -p ../CASA32-msi/$(TARGET_CFG)/CASA.msi ../BUILT/bin
-	tar -cvf $(PACKAGE)-$(VERSION).tar ./BUILT
+	cp -f $(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT) $(OBJDIR)/bin64 
+	cp -f $(TARGET_CFG)/setup.exe $(OBJDIR)/bin64 
+	cp -p ../CASA32-msi/$(TARGET_CFG)/setup.exe $(OBJDIR)/bin
+	cp -p ../CASA32-msi/$(TARGET_CFG)/CASA.msi $(OBJDIR)/bin
+	tar -cvf $(PACKAGE)-$(VERSION).tar $(OBJDIR)
 	bzip2 -z $(PACKAGE)-$(VERSION).tar
 
 	
@@ -83,11 +85,10 @@ devenv:
 	@if ! test -x "$(VSINSTALLDIR)\devenv.exe";then echo "Error: MS Studio .NET is currently required to build MSI and MSM";exit 1;fi
  
 $(OBJDIR):
-	[ -d $(OBJDIR) ] || mkdir -p $(OBJDIR)
-	[ -d $(CASABINDIR) ] || mkdir -p $(CASABINDIR)
-	[ -d ../BUILT ] || mkdir -p ../BUILT 
-	[ -d ../BUILT ] || mkdir -p ../BUILT/bin64 
-	[ -d ../BUILT ] || mkdir -p ../BUILT/bin 
+	echo "creating obj dir"	
+	[ -d $(OBJDIR) ] || mkdir -p $(OBJDIR) 
+	[ -d $(OBJDIR) ] || mkdir -p $(OBJDIR)/bin64 
+	[ -d $(OBJDIR) ] || mkdir -p $(OBJDIR)/bin 
 
 
 install-exec-local: $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT)