--- saods9/make.include.orig	2017-02-14 15:45:58.088350848 +0100
+++ saods9/make.include	2017-02-14 15:53:49.409873579 +0100
@@ -26,8 +26,8 @@
 #-------------------------- main
 
 .NOTPARALLEL :
-.PHONY	: all dirs ds9 tclcheckdns tcliis tclsignal tclxml tclzvfs xpa
-.PHONY	: tkblt tkcon tkhtml1 tkimg tkmpeg tksao tktable
+.PHONY	: all dirs ds9 tclcheckdns tcliis tclsignal tclzvfs
+.PHONY	: tkblt tkcon tkhtml1 tkmpeg tksao tktable
 .PHONY	: ast funtools
 
 all	: saods9
@@ -113,22 +113,6 @@
 
 #-------------------------- tclxml
 
-# no parallel
-tclxml	: tclxml/Makefile
-	@echo ""
-	@echo "*** Install tclxml ***"
-	$(MAKE) -C tclxml install
-
-tclxml/Makefile :
-	@echo ""
-	@echo "*** Configure tclxml ***"
-	cd tclxml; \
-	./configure \
-	$(WITHTCL) \
-	$(TCLXMLFLAGS) \
-	--prefix $(ROOT) --exec-prefix $(ROOT) \
-	--disable-shared --enable-symbols \
-	$(CACHE)
 
 #-------------------------- tclzvfs
 
@@ -149,22 +133,6 @@
 
 #-------------------------- xpa
 
-# no config.cache
-xpa	: xpa/Makefile
-	@echo ""
-	@echo "*** Install xpa ***"
-	$(MAKE) -C xpa -j $(JOBS) install
-
-xpa/Makefile :
-	@echo ""
-	@echo "*** Configure xpa ***"
-	cd xpa; \
-	./configure \
-	$(CONFIGFLAGS) $(TARGET) $(XPAFLAGS) \
-	$(WITHTCL) \
-	--prefix $(ROOT) --exec-prefix $(ROOT) \
-	--disable-shared --enable-symbols \
-	--with-x=disabled
 
 #-------------------------- tkblt
 
@@ -212,21 +180,6 @@
 
 #-------------------------- tkimg
 
-tkimg	: tkimg/Makefile
-	@echo ""
-	@echo "*** Install tkimg ***"
-	$(MAKE) -C tkimg -j $(JOBS) install
-
-# no config.cache
-tkimg/Makefile :
-	@echo ""
-	@echo "*** Configure tkimg ***"
-	cd tkimg; \
-	./configure \
-	CFLAGS='-DPNG_NO_WRITE_gAMA' \
-	$(WITHTK) $(TKIMGFLAGS) \
-	--prefix $(ROOT) --exec-prefix $(ROOT) \
-	--disable-shared --enable-symbols
 
 #-------------------------- tkmpeg
 
@@ -382,15 +335,15 @@
 
 .PHONY	: clean
 .PHONY	: dirsclean ds9clean localclean
-.PHONY	: tclclean tclcheckdnsclean tcliisclean tclsignalclean 
-.PHONY	: tclxmlclean tclzvfsclean
-.PHONY	: tkclean tkbltclean tkhtml1clean tkimgclean
-.PHONY	: tkmpegclean tksaoclean astclean funtoolsclean tktableclean xpaclean
+.PHONY	: tclcheckdnsclean tcliisclean tclsignalclean 
+.PHONY	: tclzvfsclean
+.PHONY	: tkbltclean tkhtml1clean
+.PHONY	: tkmpegclean tksaoclean astclean funtoolsclean tktableclean
 
-clean	: dirsclean tclclean tkclean \
+clean	: dirsclean \
 	tclcheckdnsclean tcliisclean tclsignalclean \
-	tclzvfsclean tclxmlclean xpaclean \
-	tkbltclean tktableclean tkimgclean \
+	tclzvfsclean \
+	tkbltclean tktableclean \
 	tkmpegclean tkhtml1clean \
 	tk$(OS)clean \
 	tksaoclean astclean funtoolsclean ds9clean \
@@ -405,9 +358,6 @@
 localclean :
 	-rm -f core *~ *#
 
-tclclean :
-	$(MAKE) -C tcl$(TCLVER)/$(OS) clean
-
 tclcheckdnsclean :
 	$(MAKE) -C tclcheckdns clean
 
@@ -417,26 +367,15 @@
 tclsignalclean :
 	$(MAKE) -C tclsignal clean
 
-tclxmlclean:
-	$(MAKE) -C tclxml clean
-
 tclzvfsclean:
 	$(MAKE) -C tclzvfs clean
 
-tkclean :
-	$(MAKE) -C tk$(TCLVER)/$(OS) clean
-
 tkbltclean:
 	$(MAKE) -C tkblt clean
 
 tkhtml1clean:
 	$(MAKE) -C tkhtml1 clean
 
-tkimgclean:
-	rm -fr tkimg/Img/*
-	rm -fr lib/Img1.*
-	$(MAKE) -C tkimg clean
-
 tkmpegclean:
 	$(MAKE) -C tkmpeg clean
 
@@ -452,23 +391,19 @@
 tktableclean:
 	$(MAKE) -C tktable clean
 
-xpaclean :
-	$(MAKE) -C xpa clean
-
 #-------------------------- distclean
 
 .PHONY	: dirsdistclean ds9distclean localdistclean 
-.PHONY	: tcldistclean tclcheckdnsdistclean tcliisdistclean tclsignaldistclean 
-.PHONY	: tclxmldistclean tclzvfsdistclean
-.PHONY	: tkdistclean tkbltdistclean tkhtml1distclean tkimgdistclean
+.PHONY	: tclcheckdnsdistclean tcliisdistclean tclsignaldistclean 
+.PHONY	: tclzvfsdistclean
+.PHONY	: tkbltdistclean tkhtml1distclean
 .PHONY	: tkmpegdistclean 
 .PHONY	: tksaodistclean astdistclean funtoolsdistclean
-.PHONY	: tktabledistclean xpadistclean
+.PHONY	: tktabledistclean
 
-distclean : tcldistclean tkdistclean \
-	tclcheckdnsdistclean tcliisdistclean tclsignaldistclean \
-	tclzvfsdistclean tclxmldistclean xpadistclean \
-	tkbltdistclean tktabledistclean tkimgdistclean \
+distclean : tclcheckdnsdistclean tcliisdistclean tclsignaldistclean \
+	tclzvfsdistclean  \
+	tkbltdistclean tktabledistclean \
 	tkmpegdistclean tkhtml1distclean \
 	tk$(OS)distclean \
 	tksaodistclean astdistclean funtoolsdistclean ds9distclean \
@@ -483,9 +418,6 @@
 localdistclean : localclean
 	-rm -f config.log config.status config.cache Makefile 
 
-tcldistclean :
-	$(MAKE) -C tcl$(TCLVER)/$(OS) distclean
-
 tclcheckdnsdistclean :
 	$(MAKE) -C tclcheckdns distclean
 
@@ -495,26 +427,15 @@
 tclsignaldistclean :
 	$(MAKE) -C tclsignal distclean
 
-tclxmldistclean:
-	$(MAKE) -C tclxml distclean
-
 tclzvfsdistclean:
 	$(MAKE) -C tclzvfs distclean
 
-tkdistclean :
-	$(MAKE) -C tk$(TCLVER)/$(OS) distclean
-
 tkbltdistclean:
 	$(MAKE) -C tkblt distclean
 
 tkhtml1distclean:
 	$(MAKE) -C tkhtml1 distclean
 
-tkimgdistclean: 
-	rm -fr tkimg/Img/*
-	rm -fr lib/Img1.*
-	$(MAKE) -C tkimg distclean
-
 tkmpegdistclean:
 	$(MAKE) -C tkmpeg distclean
 
@@ -530,9 +451,6 @@
 tktabledistclean:
 	$(MAKE) -C tktable distclean
 
-xpadistclean :
-	$(MAKE) -C xpa distclean
-
 #-------------------------- cvs
 
 .PHONY	: commit update