[Expat-checkins] CVS: expat Makefile.in,1.14,1.15 configure.in,1.20,1.21

[Greg Stein]

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

Modified Files:
	Makefile.in configure.in 
Log Message:
Clean out some unused bits from the makefiles. Remove some of the recursion
and just do it from the top-level instead.



Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile.in	2001/08/17 19:23:02	1.14
--- Makefile.in	2001/08/23 09:24:45	1.15
***************
*** 38,88 ****
  
  bindir = @bindir@
- sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
- sysconfdir = @sysconfdir@
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
  libdir = @libdir@
- infodir = @infodir@
- mandir = @mandir@
  includedir = @includedir@
- oldincludedir = /usr/include
  
  top_builddir = .
  
  
- AUTOCONF = autoconf
- 
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
! 
! NORMAL_INSTALL = :
! PRE_INSTALL = :
! POST_INSTALL = :
! NORMAL_UNINSTALL = :
! PRE_UNINSTALL = :
! POST_UNINSTALL = :
! host_alias = @host_alias@
! host_triplet = @host@
  
  CC = @CC@
  
  LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- PACKAGE = @PACKAGE@
- RANLIB = @RANLIB@
  VERSION = @VERSION@
  
  SUBDIRS = lib examples xmlwf
- INSTALLSUBDIRS = lib xmlwf
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  CONFIG_HEADERS = config.h
  
! DISTDIR = $(PACKAGE)-$(VERSION)
  DISTRIBUTION = $(DISTDIR).tar.gz
  
  default:  lib xmlwf
  
--- 38,69 ----
  
  bindir = @bindir@
  libdir = @libdir@
  includedir = @includedir@
  
  top_builddir = .
  
  
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
! mkinstalldirs = $(SHELL) $(top_srcdir)/conftools/mkinstalldirs
  
  CC = @CC@
  
  LIBTOOL = @LIBTOOL@
  VERSION = @VERSION@
  
  SUBDIRS = lib examples xmlwf
  CONFIG_HEADERS = config.h
  
! APIHEADER = expat.h
! LIBRARY = libexpat.la
! 
! 
! DISTDIR = expat-$(VERSION)
  DISTRIBUTION = $(DISTDIR).tar.gz
  
+ 
  default:  lib xmlwf
  
***************
*** 91,126 ****
  all: $(SUBDIRS)
  
- Makefile: Makefile.in config.status
- 	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) config.status
- 
- config.status: configure
- 	@if test -f $@; then \
- 		$(SHELL) config.status --recheck ; \
- 	else \
- 		$(SHELL) configure ; \
- 	fi
- 
- configure: configure.in
- 	$(AUTOCONF)
- 
- config.h: config.h.in config.status
- 	CONFIG_FILES= CONFIG_HEADERS=$(CONFIG_HEADERS) \
- 	$(SHELL) ./config.status
- 
  $(SUBDIRS):
  	cd $@ && $(MAKE)
  
  clean:
! 	for dir in $(SUBDIRS); do \
! 		(cd $$dir && $(MAKE) clean); \
! 	done
! 	rm -f core *~
  
! distclean:
! 	for dir in $(SUBDIRS); do \
! 		(cd $$dir && $(MAKE) distclean); \
! 	done
  	rm -f config.h config.status config.log config.cache libtool
! 	rm -f Makefile examples/Makefile xmlwf/Makefile
  
  extraclean: distclean
--- 72,92 ----
  all: $(SUBDIRS)
  
  $(SUBDIRS):
  	cd $@ && $(MAKE)
  
  clean:
! 	# clean up the lib dir
! 	cd lib && rm -f $(LIBRARY) *.o *.lo && rm -rf .libs _libs
! 	# clean up the xmlwf dir
! 	cd xmlwf && rm -f xmlwf *.o
! 	# clean up the examples dir
! 	cd examples && rm -f elements outline *.o
! 	# other random cleanup
! 	find . -name core | xargs rm -f
  
! distclean: clean
  	rm -f config.h config.status config.log config.cache libtool
! 	rm -f Makefile lib/Makefile examples/Makefile xmlwf/Makefile tests/Makefile
! 	rm -f lib/expat.h
  
  extraclean: distclean
***************
*** 141,145 ****
  
  check:	$(SUBDIRS)
! 	(cd tests && $(MAKE) check)
  
  $(DISTRIBUTION): distdir
--- 107,111 ----
  
  check:	$(SUBDIRS)
! 	cd tests && $(MAKE) check
  
  $(DISTRIBUTION): distdir
***************
*** 148,160 ****
  dist: $(DISTRIBUTION)
  
! install:
! 	for dir in $(INSTALLSUBDIRS); do \
! 		(cd $$dir && $(MAKE) install); \
! 	done
  
  uninstall:
! 	for dir in $(INSTALLSUBDIRS); do \
! 		(cd $$dir && $(MAKE) uninstall); \
! 	done
  
  .PHONY: buildlib all $(SUBDIRS) \
--- 114,127 ----
  dist: $(DISTRIBUTION)
  
! install: xmlwf/xmlwf lib/$(LIBRARY) lib/$(APIHEADER)
! 	$(mkinstalldirs) $(bindir) $(libdir) $(includedir)
! 	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(bindir)/xmlwf
! 	$(LIBTOOL) --mode=install $(INSTALL) lib/$(LIBRARY) $(libdir)/$(LIBRARY)
! 	$(INSTALL_DATA) lib/$(APIHEADER) $(includedir)
  
  uninstall:
! 	$(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf
! 	$(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(LIBRARY)
! 	rm -f $(libdir)/$(APIHEADER)
  
  .PHONY: buildlib all $(SUBDIRS) \

Index: configure.in
===================================================================
RCS file: /cvsroot/expat/expat/configure.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** configure.in	2001/08/17 19:23:02	1.20
--- configure.in	2001/08/23 09:24:45	1.21
***************
*** 27,31 ****
  EXPAT_VERSION=$EXPAT_MAJOR_VERSION.$EXPAT_MINOR_VERSION.$EXPAT_EDIT
  VERSION=$EXPAT_VERSION
- PACKAGE=expat
  
  dnl
--- 27,30 ----
***************
*** 49,53 ****
  AC_PROG_LIBTOOL
  
- AC_SUBST(PACKAGE)
  AC_SUBST(VERSION)
  AC_SUBST(EXPAT_MAJOR_VERSION)
--- 48,51 ----