From 866f6330ccfb01594f36e591140fa74eac3be473 Mon Sep 17 00:00:00 2001 From: Greg Stein Date: Thu, 23 Aug 2001 09:24:45 +0000 Subject: [PATCH] Clean out some unused bits from the makefiles. Remove some of the recursion and just do it from the top-level instead. --- expat/Makefile.in | 89 ++++++++++++-------------------------- expat/configure.in | 2 - expat/examples/Makefile.in | 15 ------- expat/lib/Makefile.in | 85 ++---------------------------------- expat/xmlwf/Makefile.in | 38 +--------------- 5 files changed, 33 insertions(+), 196 deletions(-) diff --git a/expat/Makefile.in b/expat/Makefile.in index 25351c65..19ead8f2 100644 --- a/expat/Makefile.in +++ b/expat/Makefile.in @@ -37,91 +37,57 @@ prefix = @prefix@ 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 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@ +mkinstalldirs = $(SHELL) $(top_srcdir)/conftools/mkinstalldirs 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) +APIHEADER = expat.h +LIBRARY = libexpat.la + + +DISTDIR = expat-$(VERSION) DISTRIBUTION = $(DISTDIR).tar.gz + default: lib xmlwf buildlib: lib 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 + # 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 examples/Makefile xmlwf/Makefile + rm -f Makefile lib/Makefile examples/Makefile xmlwf/Makefile tests/Makefile + rm -f lib/expat.h extraclean: distclean rm -f aclocal.m4 config.h.in configure @@ -140,22 +106,23 @@ distdir: MANIFEST done check: $(SUBDIRS) - (cd tests && $(MAKE) check) + cd tests && $(MAKE) check $(DISTRIBUTION): distdir tar cf - $(DISTDIR) | gzip -9 >$(DISTRIBUTION) dist: $(DISTRIBUTION) -install: - for dir in $(INSTALLSUBDIRS); do \ - (cd $$dir && $(MAKE) install); \ - done +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: - for dir in $(INSTALLSUBDIRS); do \ - (cd $$dir && $(MAKE) uninstall); \ - done + $(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf + $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(LIBRARY) + rm -f $(libdir)/$(APIHEADER) .PHONY: buildlib all $(SUBDIRS) \ clean distclean extraclean maintainer-clean \ diff --git a/expat/configure.in b/expat/configure.in index d2d8bbba..51bb34b6 100644 --- a/expat/configure.in +++ b/expat/configure.in @@ -26,7 +26,6 @@ EXPAT_EDIT=2 EXPAT_VERSION=$EXPAT_MAJOR_VERSION.$EXPAT_MINOR_VERSION.$EXPAT_EDIT VERSION=$EXPAT_VERSION -PACKAGE=expat dnl dnl Increment LIBREVISION if source code has changed at all @@ -48,7 +47,6 @@ AC_CONFIG_HEADER(config.h) AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL -AC_SUBST(PACKAGE) AC_SUBST(VERSION) AC_SUBST(EXPAT_MAJOR_VERSION) AC_SUBST(EXPAT_MINOR_VERSION) diff --git a/expat/examples/Makefile.in b/expat/examples/Makefile.in index 93fd64ec..db9b9f79 100644 --- a/expat/examples/Makefile.in +++ b/expat/examples/Makefile.in @@ -27,8 +27,6 @@ LIBS = -L$(LIBDIR) -lexpat CC = @CC@ CFLAGS = @CFLAGS@ -I$(INCDIR) -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -39,16 +37,3 @@ elements: elements.o outline: outline.o $(CC) -o $@ $< $(LDFLAGS) $(LIBS) - -check: $(SUBDIRS) - @echo - @echo This package does not yet have a regression test. - @echo - -clean: - rm -f elements outline core *.o - -distclean: clean - rm -f Makefile - -maintainer-clean: distclean diff --git a/expat/lib/Makefile.in b/expat/lib/Makefile.in index 97907392..f7e622dd 100644 --- a/expat/lib/Makefile.in +++ b/expat/lib/Makefile.in @@ -27,56 +27,19 @@ VPATH = @srcdir@ prefix = @prefix@ 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 = +LTOBJECTS = xmlparse.lo xmltok.lo xmlrole.lo INCLUDES = -I$(srcdir) -I. -I.. -DEFS = @DEFS@ -DPACKAGE='"$(PACKAGE)"' -DVERSION='"$(PACKAGE)_$(VERSION)"' +DEFS = @DEFS@ -DVERSION='"expat_$(VERSION)"' CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ @@ -89,20 +52,13 @@ LIBAGE = @LIBAGE@ 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 +LINK = $(LIBTOOL) --mode=link $(CC) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) $(CFLAGS) $(LDFLAGS) -o $@ -DISTFILES = $(DIST_COMMON) $(SOURCES) $(TEMPLATES) $(APIHEADER) $(HEADERS) - -TAR = gtar -GZIP_ENV = --best - all: $(LIBRARY) .SUFFIXES: .c .lo .o -.PHONY: all clean distclean maintainer-clean +.PHONY: all .c.o: $(COMPILE) -c $< @@ -110,39 +66,6 @@ all: $(LIBRARY) .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) $(LINK) -rpath $(libdir) $(LDFLAGS) $(LTOBJECTS) diff --git a/expat/xmlwf/Makefile.in b/expat/xmlwf/Makefile.in index 9e4bc15e..2b36d36a 100644 --- a/expat/xmlwf/Makefile.in +++ b/expat/xmlwf/Makefile.in @@ -18,10 +18,6 @@ # SOFTWARE OR THE USE OR OTHER DEALINGS IN EXPAT. # -SHELL = @SHELL@ - -bindir = @bindir@ - LIBDIR= ../lib/.libs INCDIR= ../lib @@ -29,42 +25,10 @@ LDFLAGS= @LDFLAGS@ -static CFLAGS= @CFLAGS@ -I$(INCDIR) CC = @CC@ -FILEMAP_OBJ= @FILEMAP_OBJ@ -OBJS= xmlwf.o xmlfile.o codepage.o $(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 -- 2.40.0