[Expat-checkins] CVS: expat/lib Makefile.in,1.15,1.16

[Greg Stein]

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

Modified Files:
	Makefile.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/lib/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile.in	2001/07/25 15:13:38	1.15
--- Makefile.in	2001/08/23 09:24:45	1.16
***************
*** 28,81 ****
  exec_prefix = @exec_prefix@
  
- 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
  
- subdir = lib
- 
  top_builddir = ..
  
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- 
- host_alias = @host_alias@
- host_triplet = @host@
- AS = @AS@
  CC = @CC@
- DLLTOOL = @DLLTOOL@
  LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- OBJDUMP = @OBJDUMP@
- PACKAGE = @PACKAGE@
- RANLIB = @RANLIB@
  VERSION = @VERSION@
  
  LIBRARY = libexpat.la
! SOURCES = xmlparse.c xmltok.c xmlrole.c
! OBJECTS = $(SOURCES:.c=.o)
! LTOBJECTS = $(SOURCES:.c=.lo)
! 
! TEMPLATES = xmltok_impl.c xmltok_ns.c
! APIHEADER = expat.h
! HEADERS = ascii.h iasciitab.h utf8tab.h xmltok.h asciitab.h latin1tab.h \
!           nametab.h xmldef.h xmlrole.h xmltok_impl.h
! 
! mkinstalldirs = $(SHELL) $(top_srcdir)/conftools/mkinstalldirs
! CONFIG_HEADER = ../config.h
! CONFIG_CLEAN_FILES = 
  
  INCLUDES = -I$(srcdir) -I. -I..
! DEFS = @DEFS@ -DPACKAGE='"$(PACKAGE)"' -DVERSION='"$(PACKAGE)_$(VERSION)"'
  
  CPPFLAGS = @CPPFLAGS@
--- 28,44 ----
  exec_prefix = @exec_prefix@
  
  libdir = @libdir@
  
  top_builddir = ..
  
  CC = @CC@
  LIBTOOL = @LIBTOOL@
  VERSION = @VERSION@
  
  LIBRARY = libexpat.la
! LTOBJECTS = xmlparse.lo xmltok.lo xmlrole.lo
  
  INCLUDES = -I$(srcdir) -I. -I..
! DEFS = @DEFS@ -DVERSION='"expat_$(VERSION)"'
  
  CPPFLAGS = @CPPFLAGS@
***************
*** 90,107 ****
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
! CCLD = $(CC)
! LINK = $(LIBTOOL) --mode=link  $(CCLD) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) $(CFLAGS) $(LDFLAGS) -o $@
! DIST_COMMON =  Makefile.in
! 
  
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(TEMPLATES) $(APIHEADER) $(HEADERS) 
  
- TAR = gtar
- GZIP_ENV = --best
- 
  all: $(LIBRARY)
  
  .SUFFIXES: .c .lo .o
! .PHONY: all clean distclean maintainer-clean
  
  .c.o:
--- 53,63 ----
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
! LINK = $(LIBTOOL) --mode=link  $(CC) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) $(CFLAGS) $(LDFLAGS) -o $@
  
  
  all: $(LIBRARY)
  
  .SUFFIXES: .c .lo .o
! .PHONY: all
  
  .c.o:
***************
*** 110,146 ****
  .c.lo:
  	$(LTCOMPILE) -c $<
- 
- Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) \
- 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
- $(top_builddir)/config.status: $(top_builddir)/configure
- 	cd $(top_builddir) && $(MAKE) config.status
- 
- $(top_builddir)/config.h: $(top_builddir)/config.h.in
- 	cd $(top_builddir) && $(MAKE) config.h
- 
- clean:
- 	rm -f $(LIBRARY) *.o *.lo *~
- 	rm -rf .libs _libs
- 
- distclean: clean
- 	rm -f Makefile
- 
- maintainer-clean: distclean
- 
- check:	$(SUBDIRS)
- 	@echo
- 	@echo This package does not yet have a regression test.
- 	@echo
- 
- install: $(LIBRARY) $(APIHEADER)
- 	$(mkinstalldirs) $(libdir) $(includedir)
- 	$(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(libdir)/$(LIBRARY)
- 	$(INSTALL_DATA) $(APIHEADER) $(includedir)
- 
- uninstall:
- 	$(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(LIBRARY);
- 	rm -f $(libdir)/$(APIHEADER)
  
  $(LIBRARY): $(LTOBJECTS)
--- 66,69 ----