cleanup win32/64 makefile

1 files changed, 8 insertions, 33 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index 6be959b..794693b 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -36,10 +36,10 @@ DS9APP	=SAOImage\ DS9\ $(DS9_VERSION)
 
 #--------------------------build
 
-.PHONY	: saods9 tcl tk tkwin libxml2 libxslt zlib openssl
+.PHONY	: saods9 tcl tk tkwin libxml2 zlib openssl
 
 saods9	: dirs tcl tk \
-	libxml2 libxslt zlib openssl \
+	libxml2 zlib openssl \
 	tcliis tls tclxml xpa \
 	tkblt tktable tkimg \
 	tkmpeg tkhtml1 tkcon \
@@ -99,8 +99,8 @@ libxml2 : libxml2/win32/config.mingw
 	@echo "*** $@ ***"
 	$(CONFIGFLAGS) $(MAKE) -e -C libxml2/win32 -j $(JOBS) -f Makefile.mingw dep
 	$(CONFIGFLAGS) $(MAKE) -e -C libxml2/win32 -j $(JOBS) -f Makefile.mingw libxmla
-	$(CONFIGFLAGS) $(MAKE) -e -C libxml2/win32 -j $(JOBS) -f Makefile.mingw install-libsa
-	cp libxml2/win32/xml2-config $(bindir)
+	cp -p libxml2/win32/bin.mingw/libxml2.a $(libdir)
+	cp -rp libxml2/include $(includedir)/libxml2
 
 libxml2/win32/config.mingw :
 	@echo ""
@@ -108,21 +108,6 @@ libxml2/win32/config.mingw :
 	cd libxml2/win32; \
 	cscript configure.js trio=no threads=no ftp=yes http=yes html=yes c14n=yes catalog=yes docb=yes xpath=yes xptr=yes xinclude=yes iconv=no icu=no iso8859x=no zlib=no lzma=no xml_debug=yes mem_debug=yes run_debug=no regexps=yes modules=no tree=yes reader=yes writer=yes walker=yes pattern=yes push=yes valid=yes sax1=yes legacy=yes output=yes schemas=yes schematron=yes python=no compiler=mingw static=yes prefix="..\.." bindir="..\..\bin" incdir="..\..\include" libdir="..\..\lib"
 
-libxslt : libxslt/win32/config.mingw
-	@echo ""
-	@echo "*** $@ ***"
-	$(CONFIGFLAGS) $(MAKE) -e -C libxslt/win32 -j $(JOBS) -f Makefile.mingw dep
-	$(CONFIGFLAGS) $(MAKE) -e -C libxslt/win32 -j $(JOBS) -f Makefile.mingw libxslta
-	$(CONFIGFLAGS) $(MAKE) -e -C libxslt/win32 -j $(JOBS) -f Makefile.mingw libexslta
-	$(CONFIGFLAGS) $(MAKE) -e -C libxslt/win32 -j $(JOBS) -f Makefile.mingw install-libsa
-	cp libxslt/win32/xslt-config $(bindir)
-
-libxslt/win32/config.mingw :
-	@echo ""
-	@echo "*** $@ ***"
-	cd libxslt/win32; \
-	cscript configure.js trio=no xslt_debug=yes mem_debug=no debugger=yes iconv=no zlib=no crypto=yes modules=no locale=yes compiler=mingw static=yes prefix="..\.." bindir="..\..\bin" incdir="..\..\include" libdir="..\..\lib"
-
 # must force Makefile
 zlib	: zlib_Makefile
 	@echo ""
@@ -151,9 +136,9 @@ openssl/Makefile:
 
 #--------------------------clean
 
-.PHONY	: tkwinclean libxml2clean libxsltclean zlibclean opensslclean
+.PHONY	: tkwinclean libxml2clean zlibclean opensslclean
 
-tkwinclean : libxml2clean libxsltclean zlibclean opensslclean
+tkwinclean : libxml2clean zlibclean opensslclean
 	@echo ""
 	@echo "*** $@ ***"
 	$(MAKE) -C tkwin clean
@@ -163,11 +148,6 @@ libxml2clean :
 	@echo "*** $@ ***"
 	$(MAKE) -C libxml2/win32 -f Makefile.mingw clean
 
-libxsltclean :
-	@echo ""
-	@echo "*** $@ ***"
-	$(MAKE) -C libxslt/win32 -f Makefile.mingw clean
-
 zlibclean :
 	@echo ""
 	@echo "*** $@ ***"
@@ -180,9 +160,9 @@ opensslclean:
 
 #--------------------------distclean
 
-.PHONY	: tkwindistclean libxml2distclean libxsltdistclean zlibdistclean openssldistclean
+.PHONY	: tkwindistclean libxml2distclean zlibdistclean openssldistclean
 
-tkwindistclean : libxml2distclean libxsltdistclean zlibdistclean openssldistclean
+tkwindistclean : libxml2distclean zlibdistclean openssldistclean
 	@echo ""
 	@echo "*** $@ ***"
 	$(MAKE) -C tkwin distclean
@@ -192,11 +172,6 @@ libxml2distclean :
 	@echo "*** $@ ***"
 	$(MAKE) -C libxml2/win32 -f Makefile.mingw distclean
 
-libxsltdistclean :
-	@echo ""
-	@echo "*** $@ ***"
-	$(MAKE) -C libxslt/win32 -f Makefile.mingw distclean
-
 zlibdistclean :
 	@echo ""
 	@echo "*** $@ ***"