[Expat-checkins] CVS: expat/xmlwf Makefile.in,1.7,1.8

Greg Stein gstein@users.sourceforge.net
Thu, 23 Aug 2001 02:24:47 -0700


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

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/xmlwf/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.in	2001/08/10 13:53:58	1.7
--- Makefile.in	2001/08/23 09:24:45	1.8
***************
*** 19,26 ****
  #
  
- SHELL = @SHELL@
- 
- bindir = @bindir@
- 
  LIBDIR= ../lib/.libs
  INCDIR= ../lib
--- 19,22 ----
***************
*** 30,70 ****
  CC = @CC@
  
! FILEMAP_OBJ= @FILEMAP_OBJ@
! OBJS= xmlwf.o xmlfile.o codepage.o $(FILEMAP_OBJ)
  LIBS= -L$(LIBDIR) -lexpat
  
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = ${INSTALL}
- LIBTOOL = @LIBTOOL@
- mkinstalldirs = $(SHELL) $(top_srcdir)/conftools/mkinstalldirs
- 
- srcdir = @srcdir@
- top_builddir = ..
- top_srcdir = @top_srcdir@
  VPATH = @srcdir@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
  
- 
  xmlwf: $(OBJS)
  	$(CC) -o xmlwf $(LDFLAGS) $(OBJS) $(LIBS)
- 
- install: xmlwf
- 	$(mkinstalldirs) $(bindir)
- 	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf $(bindir)/xmlwf
- 
- uninstall:
- 	$(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf
- 
- check:	$(SUBDIRS)
- 	@echo
- 	@echo This package does not yet have a regression test.
- 	@echo
- 
- clean:
- 	rm -f xmlwf core *.o
- 
- distclean: clean
- 	rm -f Makefile
- 
- maintainer-clean: distclean
--- 26,34 ----
  CC = @CC@
  
! OBJS= xmlwf.o xmlfile.o codepage.o @FILEMAP_OBJ@
  LIBS= -L$(LIBDIR) -lexpat
  
  VPATH = @srcdir@
  
  xmlwf: $(OBJS)
  	$(CC) -o xmlwf $(LDFLAGS) $(OBJS) $(LIBS)