[Expat-checkins] CVS: expat Makefile.in,1.19,1.20

[Fred L. Drake]

Update of /cvsroot/expat/expat
In directory usw-pr-cvs1:/tmp/cvs-serv29641

Modified Files:
	Makefile.in 
Log Message:
Revert previous change and use an alternate approach, this time actually
tested on one of the platforms that exhibited the problem this tries to
fix.  Solution contributed by Michael C. Maggio; thanks!


Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Makefile.in	2001/10/01 20:15:39	1.19
--- Makefile.in	2001/10/02 16:40:17	1.20
***************
*** 53,56 ****
--- 53,57 ----
  LIBTOOL = @LIBTOOL@
  
+ SUBDIRS = lib examples xmlwf
  CONFIG_HEADERS = config.h
  
***************
*** 58,76 ****
  LIBRARY = libexpat.la
  
- 
- default:  library xmlwf
- 
- buildlib: library
  
! all: library wfchecker samples
  
! library:
! 	cd lib && $(MAKE)
  
! wfchecker:
! 	cd xmlwf && $(MAKE)
  
! samples:
! 	cd examples && $(MAKE)
  
  clean:
--- 59,71 ----
  LIBRARY = libexpat.la
  
  
! default:  lib xmlwf
  
! buildlib: lib
  
! all: $(SUBDIRS)
  
! $(SUBDIRS)::
! 	cd $@ && $(MAKE)
  
  clean:
***************
*** 89,93 ****
  	rm -f conftools/ltconfig conftools/ltmain.sh
  
! check:	all
  	cd tests && $(MAKE) check
  
--- 84,88 ----
  	rm -f conftools/ltconfig conftools/ltmain.sh
  
! check:	$(SUBDIRS)
  	cd tests && $(MAKE) check
  
***************
*** 103,107 ****
  	rm -f $(libdir)/$(APIHEADER)
  
! .PHONY: buildlib all library wfchecker samples \
  	clean distclean extraclean maintainer-clean \
  	dist distdir \
--- 98,102 ----
  	rm -f $(libdir)/$(APIHEADER)
  
! .PHONY: buildlib all $(SUBDIRS) \
  	clean distclean extraclean maintainer-clean \
  	dist distdir \