move vs_solutions to package directory

Makefile.am

@@ -34,8 +34,8 @@ DIST_SUBDIRS = c_micasacache c_common c_micasadk c_micasad c_sharp  \
 endif
 
 if WINDOWS
-SUBDIRS = c_micasacache c_common c_micasadk c_jwrapper vs_solutions package 
+SUBDIRS = c_micasacache c_common c_micasadk c_jwrapper  package 
-DIST_SUBDIRS = c_micasacache c_common c_micasadk c_jwrapper vs_solutions package
+DIST_SUBDIRS = c_micasacache c_common c_micasadk c_jwrapper  package
 endif
 
 EXTRA_DIST = include include/*.h \

configure.in

@@ -306,11 +306,11 @@ c_jwrapper/src/Makefile
 c_jwrapper/jnsscs/Makefile
 c_jwrapper/jnsscs/linux/Makefile
 c_jwrapper/jnsscs/windows/Makefile
-vs_solutions/Makefile
-vs_solutions/CASAInstall/Makefile
 package/Makefile
 package/linux/Makefile
 package/windows/Makefile
+package/windows/vs_solutions/Makefile
+package/windows/vs_solutions/CASAInstall/Makefile
 package/linux/CASA.spec
 ])
 

package/windows/Makefile.am

@@ -18,39 +18,18 @@
 #
 #
 #######################################################################
-#how do you get the version??
-if DEBUG
-TARGET_CFG = Debug
-CFLAGS += -v -w
-else
-TARGET_CFG = Release
-endif
 
-BUILT_FILE = $(PACKAGE)-$(VERSION).tar.bz2
+SUBDIRS = vs_solutions
 
-.PHONY: package package-clean package-install package-uninstall casa
+DIST_SUBDIRS = vs_solutions
 
-package: $(BUILT_FILE)
+CFILES =
 
-all clean:
+EXTRA_DIST = 
 
-$(BUILT_FILE):
+.PHONY: package package-clean package-install package-uninstall
-	[ -d BUILT ] | mkdir -p BUILT 
+package package-clean package-install package-uninstall:
-	cp -p $(top_srcdir)/bin/Setup.* BUILT
+	$(MAKE) -C $(TARGET_OS) $@
-	cp -p $(top_srcdir)/bin/CASA.msi BUILT
-	tar -cvf $(PACKAGE)-$(VERSION).tar ./BUILT
-	bzip2 -z $(PACKAGE)-$(VERSION).tar 
-
-package-install: package
-	
-package-uninstall:
-
-package-clean clean-local:
-	rm -f  *.bz2
-	rm -rf BUILT
-
-distclean-local: package-clean
-	rm -f Makefile $(BUILT_FILE)
 
 maintainer-clean-local:
 	rm -f Makefile.in

package/windows/vs_solutions/CASAInstall/Makefile.am

@@ -74,7 +74,13 @@ $(MODULE_NAME).$(MODULE_EXT): $(SFILES) $(OBJDIR) devenv
 	"$(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
+	tar -cvf $(PACKAGE)-$(VERSION).tar ./BUILT
+	bzip2 -z $(PACKAGE)-$(VERSION).tar
 
+	
 devenv:
 	@if ! test -x "$(VSINSTALLDIR)/devenv.exe";then echo "Error: MS Studio .NET is currently required to build MSI and MSM";exit 1;fi
  
@@ -102,6 +108,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
 
 distclean-local: