diff --git a/ice-9/Makefile.in b/ice-9/Makefile.in index 7ae7dd7f6..28f32666d 100644 --- a/ice-9/Makefile.in +++ b/ice-9/Makefile.in @@ -30,7 +30,7 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . +top_builddir = .. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -49,10 +49,25 @@ POST_INSTALL = true NORMAL_UNINSTALL = true PRE_UNINSTALL = true POST_UNINSTALL = true +host_alias = @host_alias@ +host_triplet = @host@ +AWK = @AWK@ +CC = @CC@ +LIBLOBJS = @LIBLOBJS@ +LIBTOOL = @LIBTOOL@ MAINT = @MAINT@ PACKAGE = @PACKAGE@ +RANLIB = @RANLIB@ +THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ -module = @module@ +qtmd_h = @qtmd_h@ +qtmdb_s = @qtmdb_s@ +qtmdc_c = @qtmdc_c@ +qtmdc_o = @qtmdc_o@ +qtmds_o = @qtmds_o@ +qtmds_s = @qtmds_s@ +target_libs = @target_libs@ +xtra_PLUGIN_guile_libs = @xtra_PLUGIN_guile_libs@ AUTOMAKE_OPTIONS = foreign @@ -61,13 +76,12 @@ subpkgdata_DATA = boot-9.scm debug.scm expect.scm hcons.scm lineio.scm \ mapping.scm poe.scm slib.scm tags.scm threads.scm r4rs.scm EXTRA_DIST = PLUGIN/REQ $(subpkgdata_DATA) test.scm -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = ../libguile/scmconfig.h CONFIG_CLEAN_FILES = DATA = $(subpkgdata_DATA) -DIST_COMMON = COPYING ChangeLog Makefile.am Makefile.in aclocal.m4 \ -configure configure.in +DIST_COMMON = COPYING ChangeLog Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -78,19 +92,12 @@ default: all .SUFFIXES: $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile + cd $(top_srcdir) && $(AUTOMAKE) --foreign ice-9/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ - && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -$(srcdir)/aclocal.m4: @MAINT@ configure.in - cd $(srcdir) && $(ACLOCAL) - -config.status: configure - $(SHELL) ./config.status --recheck -$(srcdir)/configure: @MAINT@configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) install-subpkgdataDATA: $(subpkgdata_DATA) @$(NORMAL_INSTALL) @@ -114,43 +121,10 @@ tags: TAGS TAGS: -distdir = $(PACKAGE)-$(VERSION) -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - rm -rf $(distdir) - GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz - mkdir $(distdir)/=build - mkdir $(distdir)/=inst - dc_install_base=`cd $(distdir)/=inst && pwd`; \ - cd $(distdir)/=build \ - && ../configure --srcdir=.. --prefix=$$dc_install_base \ - && $(MAKE) \ - && $(MAKE) dvi \ - && $(MAKE) check \ - && $(MAKE) install \ - && $(MAKE) installcheck \ - && $(MAKE) dist - rm -rf $(distdir) - @echo "========================"; \ - echo "$(distdir).tar.gz is ready for distribution"; \ - echo "========================" -dist: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir) - rm -rf $(distdir) -dist-all: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir) - rm -rf $(distdir) +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = ice-9 distdir: $(DISTFILES) - rm -rf $(distdir) - mkdir $(distdir) - -chmod 755 $(distdir) - here=`pwd`; distdir=`cd $(distdir) && pwd` \ - && cd $(srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(srcdir) --output-dir=$$distdir --foreign $(mkinstalldirs) $(distdir)/PLUGIN @for file in $(DISTFILES); do \ d=$(srcdir); \ @@ -202,11 +176,11 @@ clean: clean-generic mostlyclean distclean: distclean-generic clean rm -f config.status + rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." - rm -f config.status .PHONY: default uninstall-subpkgdataDATA install-subpkgdataDATA tags \ distdir info dvi installcheck install-exec install-data install \ diff --git a/ice-9/configure b/ice-9/configure deleted file mode 100755 index e69de29bb..000000000 diff --git a/ice-9/configure.in b/ice-9/configure.in deleted file mode 100644 index e69de29bb..000000000 diff --git a/qt/Makefile.in b/qt/Makefile.in index ee8ff8a99..381e1b481 100644 --- a/qt/Makefile.in +++ b/qt/Makefile.in @@ -30,7 +30,7 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . +top_builddir = .. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -51,12 +51,15 @@ PRE_UNINSTALL = true POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ +AWK = @AWK@ CC = @CC@ +LIBLOBJS = @LIBLOBJS@ +LIBTOOL = @LIBTOOL@ MAINT = @MAINT@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ -module = @module@ qtmd_h = @qtmd_h@ qtmdb_s = @qtmdb_s@ qtmdc_c = @qtmdc_c@ @@ -64,6 +67,7 @@ qtmdc_o = @qtmdc_o@ qtmds_o = @qtmds_o@ qtmds_s = @qtmds_s@ target_libs = @target_libs@ +xtra_PLUGIN_guile_libs = @xtra_PLUGIN_guile_libs@ AUTOMAKE_OPTIONS = foreign @@ -77,13 +81,13 @@ libqt_a_LIBADD = qtmds.o qtmdc.o EXTRA_DIST = CHANGES README.MISC README.PORT b.h meas.c stp.c stp.h \ PLUGIN/OPT Makefile.base config -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = ../libguile/scmconfig.h CONFIG_CLEAN_FILES = qt.h LIBRARIES = $(lib_LIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) +DEFS = @DEFS@ -I. -I$(srcdir) -I../libguile CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -92,9 +96,9 @@ libqt_a_OBJECTS = qt.o AR = ar CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(CC) $(LDFLAGS) -o $@ -DIST_COMMON = README ChangeLog INSTALL Makefile.am Makefile.in \ -aclocal.m4 configure configure.in qt.h.in +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ +DIST_COMMON = README ChangeLog INSTALL Makefile.am Makefile.in qt.h.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -108,23 +112,16 @@ OBJECTS = $(libqt_a_OBJECTS) default: all .SUFFIXES: -.SUFFIXES: .c .o +.SUFFIXES: .c .o .lo $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile + cd $(top_srcdir) && $(AUTOMAKE) --foreign qt/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ - && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -$(srcdir)/aclocal.m4: @MAINT@ configure.in - cd $(srcdir) && $(ACLOCAL) - -config.status: configure - $(SHELL) ./config.status --recheck -$(srcdir)/configure: @MAINT@configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) qt.h: $(top_builddir)/config.status qt.h.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status + cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status mostlyclean-libLIBRARIES: @@ -171,6 +168,19 @@ distclean-compile: maintainer-clean-compile: +.c.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +mostlyclean-libtool: + rm -f *.lo + +clean-libtool: + rm -rf .libs + +distclean-libtool: + +maintainer-clean-libtool: + libqt.a: $(libqt_a_OBJECTS) $(libqt_a_DEPENDENCIES) rm -f libqt.a $(AR) cru libqt.a $(libqt_a_OBJECTS) $(libqt_a_LIBADD) @@ -224,43 +234,10 @@ distclean-tags: maintainer-clean-tags: -distdir = $(PACKAGE)-$(VERSION) -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - rm -rf $(distdir) - GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz - mkdir $(distdir)/=build - mkdir $(distdir)/=inst - dc_install_base=`cd $(distdir)/=inst && pwd`; \ - cd $(distdir)/=build \ - && ../configure --srcdir=.. --prefix=$$dc_install_base \ - && $(MAKE) \ - && $(MAKE) dvi \ - && $(MAKE) check \ - && $(MAKE) install \ - && $(MAKE) installcheck \ - && $(MAKE) dist - rm -rf $(distdir) - @echo "========================"; \ - echo "$(distdir).tar.gz is ready for distribution"; \ - echo "========================" -dist: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir) - rm -rf $(distdir) -dist-all: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir) - rm -rf $(distdir) +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = qt distdir: $(DISTFILES) - rm -rf $(distdir) - mkdir $(distdir) - -chmod 755 $(distdir) - here=`pwd`; distdir=`cd $(distdir) && pwd` \ - && cd $(srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(srcdir) --output-dir=$$distdir --foreign $(mkinstalldirs) $(distdir)/PLUGIN @for file in $(DISTFILES); do \ d=$(srcdir); \ @@ -346,18 +323,20 @@ maintainer-clean-generic: test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean-am: mostlyclean-libLIBRARIES mostlyclean-compile \ - mostlyclean-tags mostlyclean-depend mostlyclean-generic + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ + mostlyclean-generic -clean-am: clean-libLIBRARIES clean-compile clean-tags clean-depend \ - clean-generic mostlyclean-am +clean-am: clean-libLIBRARIES clean-compile clean-libtool clean-tags \ + clean-depend clean-generic mostlyclean-am -distclean-am: distclean-libLIBRARIES distclean-compile distclean-tags \ - distclean-depend distclean-generic clean-am +distclean-am: distclean-libLIBRARIES distclean-compile \ + distclean-libtool distclean-tags distclean-depend \ + distclean-generic clean-am maintainer-clean-am: maintainer-clean-libLIBRARIES \ - maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-depend maintainer-clean-generic \ - distclean-am + maintainer-clean-compile maintainer-clean-libtool \ + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am mostlyclean: mostlyclean-recursive mostlyclean-am @@ -365,17 +344,18 @@ clean: clean-recursive clean-am distclean: distclean-recursive distclean-am rm -f config.status + rm -f libtool maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." - rm -f config.status .PHONY: default mostlyclean-libLIBRARIES distclean-libLIBRARIES \ clean-libLIBRARIES maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \ install-libLIBRARIES mostlyclean-compile distclean-compile \ -clean-compile maintainer-clean-compile install-data-recursive \ -uninstall-data-recursive install-exec-recursive \ +clean-compile maintainer-clean-compile mostlyclean-libtool \ +distclean-libtool clean-libtool maintainer-clean-libtool \ +install-data-recursive uninstall-data-recursive install-exec-recursive \ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ all-recursive check-recursive installcheck-recursive info-recursive \ dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ diff --git a/qt/configure b/qt/configure deleted file mode 100755 index e69de29bb..000000000 diff --git a/qt/configure.in b/qt/configure.in deleted file mode 100644 index e69de29bb..000000000