* build tweaks

2001-06-26  Frank Ch. Eigler  <fche@redhat.com>

        * Makefile.am (ACLOCAL_AMFLAGS): Refer to $srcdir.
        * Makefile.in: Regenerated.

diff --git a/sid/ChangeLog b/sid/ChangeLog
index e0f992e..35e4ec5 100644 (file)
--- a/sid/ChangeLog
+++ b/sid/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-26  Frank Ch. Eigler  <fche@redhat.com>
+
+       * Makefile.am (ACLOCAL_AMFLAGS): Refer to $srcdir.
+       * Makefile.in: Regenerated.
+
 2001-03-26  Frank Ch. Eigler  <fche@redhat.com>
 
         * Makefile.am (install-data-local): Install COPYING.SID in $prefix.

diff --git a/sid/Makefile.am b/sid/Makefile.am
index e5dabc0..ba7df50 100644 (file)
--- a/sid/Makefile.am
+++ b/sid/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ./config
+ACLOCAL_AMFLAGS = -I $(srcdir)/config
 SUBDIRS = @subdirs@
 
 EXTRA_DIST = COPYING.SID

diff --git a/sid/Makefile.in b/sid/Makefile.in
index 16423ec..9fde7db 100644 (file)
--- a/sid/Makefile.in
+++ b/sid/Makefile.in
@@ -74,7 +74,7 @@ sidtarget_ppc = @sidtarget_ppc@
 target = @target@
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ./config
+ACLOCAL_AMFLAGS = -I $(srcdir)/config
 SUBDIRS = @subdirs@
 
 EXTRA_DIST = COPYING.SID
@@ -98,10 +98,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-               ./config/am_rpm_init.m4 ./config/cgen-maint.m4 \
-               ./config/libstdc++.m4 ./config/libtool.m4 \
-               ./config/ltdl.m4 ./config/sidtargets.m4
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)

diff --git a/sid/bsp/ChangeLog b/sid/bsp/ChangeLog
index 9b524ef..f441249 100644 (file)
--- a/sid/bsp/ChangeLog
+++ b/sid/bsp/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-26  Frank Ch. Eigler  <fche@redhat.com>
+
+       * Makefile.am (ACLOCAL_AMFLAGS): Refer to $srcdir.
+       * Makefile.in: Regenerated.
+
 2001-06-23  Frank Ch. Eigler  <fche@redhat.com>
 
        * configrun-sid.in: Add support for --memory-region latency settings.

diff --git a/sid/bsp/Makefile.am b/sid/bsp/Makefile.am
index b5424b4..90943cf 100644 (file)
--- a/sid/bsp/Makefile.am
+++ b/sid/bsp/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../config
 
 SUBDIRS = . pregen
 

diff --git a/sid/bsp/Makefile.in b/sid/bsp/Makefile.in
index f36ad7c..a8ab6dd 100644 (file)
--- a/sid/bsp/Makefile.in
+++ b/sid/bsp/Makefile.in
@@ -70,7 +70,7 @@ sidtarget_mips = @sidtarget_mips@
 sidtarget_ppc = @sidtarget_ppc@
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../config
 
 SUBDIRS = . pregen
 
@@ -105,10 +105,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-               ../config/am_rpm_init.m4 ../config/cgen-maint.m4 \
-               ../config/libstdc++.m4 ../config/libtool.m4 \
-               ../config/ltdl.m4 ../config/sidtargets.m4
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)

diff --git a/sid/bsp/pregen/ChangeLog b/sid/bsp/pregen/ChangeLog
index ccd5684..58a30c8 100644 (file)
--- a/sid/bsp/pregen/ChangeLog
+++ b/sid/bsp/pregen/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-26  Frank Ch. Eigler  <fche@redhat.com>
+
+       * Makefile.am (ACLOCAL_AMFLAGS): Refer to $srcdir.
+       * Makefile.in: Regenerated.
+
 2001-04-05  Frank Ch. Eigler  <fche@redhat.com>
 
        * pregen-configs.in (arm): Generate redboot rather than cygmon .conf

diff --git a/sid/bsp/pregen/Makefile.am b/sid/bsp/pregen/Makefile.am
index 2bce972..0cd0aaa 100644 (file)
--- a/sid/bsp/pregen/Makefile.am
+++ b/sid/bsp/pregen/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)

diff --git a/sid/bsp/pregen/Makefile.in b/sid/bsp/pregen/Makefile.in
index 8097615..0b3b37d 100644 (file)
--- a/sid/bsp/pregen/Makefile.in
+++ b/sid/bsp/pregen/Makefile.in
@@ -70,7 +70,7 @@ sidtarget_mips = @sidtarget_mips@
 sidtarget_ppc = @sidtarget_ppc@
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
 mkinstalldirs = $(SHELL) $(top_srcdir)/../config/mkinstalldirs
 CONFIG_CLEAN_FILES =  pregen-configs
 DIST_COMMON =  ChangeLog Makefile.am Makefile.in pregen-configs.in

diff --git a/sid/component/ChangeLog b/sid/component/ChangeLog
index 01ec980..6ea5999 100644 (file)
--- a/sid/component/ChangeLog
+++ b/sid/component/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-26  Frank Ch. Eigler  <fche@redhat.com>
+
+       * Makefile.am (ACLOCAL_AMFLAGS): Refer to $srcdir.
+       * Makefile.in: Regenerated.
+
 2001-06-12  Ben Elliston  <bje@redhat.com>
 
        * CATALOG: Add hw-cache-basic and friends.

diff --git a/sid/component/Makefile.am b/sid/component/Makefile.am
index 47f3619..b66f43a 100644 (file)
--- a/sid/component/Makefile.am
+++ b/sid/component/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../config
 
 SUBDIRS = @subdirs@ @make_subdirs@
 

diff --git a/sid/component/Makefile.in b/sid/component/Makefile.in
index 4e5ffed..858952c 100644 (file)
--- a/sid/component/Makefile.in
+++ b/sid/component/Makefile.in
@@ -87,7 +87,7 @@ sidtarget_ppc = @sidtarget_ppc@
 socket_libs = @socket_libs@
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../config
 
 SUBDIRS = @subdirs@ @make_subdirs@
 
@@ -115,11 +115,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-               ../config/am_rpm_init.m4 ../config/cgen-bfd-dis.m4 \
-               ../config/cgen-maint.m4 ../config/libstdc++.m4 \
-               ../config/libtool.m4 ../config/ltdl.m4 \
-               ../config/sidtargets.m4
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)

diff --git a/sid/component/audio/ChangeLog b/sid/component/audio/ChangeLog
index 13040f1..37b6392 100644 (file)
--- a/sid/component/audio/ChangeLog
+++ b/sid/component/audio/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-26  Frank Ch. Eigler  <fche@redhat.com>
+
+       * Makefile.am (ACLOCAL_AMFLAGS): Refer to $srcdir.
+       * Makefile.in: Regenerated.
+
 2001-03-21  Ben Elliston  <bje@redhat.com>
 
        * Makefile.in: Regenerate.

diff --git a/sid/component/audio/Makefile.am b/sid/component/audio/Makefile.am
index 1492a72..2445e5a 100644 (file)
--- a/sid/component/audio/Makefile.am
+++ b/sid/component/audio/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
 
 pkglib_LTLIBRARIES = libaudio.la
 

diff --git a/sid/component/audio/Makefile.in b/sid/component/audio/Makefile.in
index 67e695a..2c5207b 100644 (file)
--- a/sid/component/audio/Makefile.in
+++ b/sid/component/audio/Makefile.in
@@ -78,7 +78,7 @@ RANLIB = @RANLIB@
 VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
 
 pkglib_LTLIBRARIES = libaudio.la
 
@@ -134,10 +134,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-               ../../config/am_rpm_init.m4 ../../config/cgen-maint.m4 \
-               ../../config/libstdc++.m4 ../../config/libtool.m4 \
-               ../../config/ltdl.m4 ../../config/sidtargets.m4
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)

diff --git a/sid/component/cfgroot/ChangeLog b/sid/component/cfgroot/ChangeLog
index 86b4984..a343833 100644 (file)
--- a/sid/component/cfgroot/ChangeLog
+++ b/sid/component/cfgroot/ChangeLog
@@ -1,3 +1,10 @@
+2001-06-26  Frank Ch. Eigler  <fche@redhat.com>
+
+       * Makefile.am (ACLOCAL_AMFLAGS): Refer to $srcdir.
+       * libltdl/Makefile.am: Ditto.
+       * Makefile.in: Regenerated.
+       * libltdl/Makefile.in: Ditto.
+
 2001-05-22  Ben Elliston  <bje@redhat.com>
 
        * compConfig.cxx (cfgroot_component::num_invalid_chars): New.

diff --git a/sid/component/cfgroot/Makefile.am b/sid/component/cfgroot/Makefile.am
index b2227a4..e3a7e85 100644 (file)
--- a/sid/component/cfgroot/Makefile.am
+++ b/sid/component/cfgroot/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
 
 SUBDIRS = @subdirs@
 

diff --git a/sid/component/cfgroot/Makefile.in b/sid/component/cfgroot/Makefile.in
index 9371812..7cbc512 100644 (file)
--- a/sid/component/cfgroot/Makefile.in
+++ b/sid/component/cfgroot/Makefile.in
@@ -79,7 +79,7 @@ RANLIB = @RANLIB@
 VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
 
 SUBDIRS = @subdirs@
 
@@ -136,10 +136,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-               ../../config/am_rpm_init.m4 ../../config/cgen-maint.m4 \
-               ../../config/libstdc++.m4 ../../config/libtool.m4 \
-               ../../config/ltdl.m4 ../../config/sidtargets.m4
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)

diff --git a/sid/component/cfgroot/libltdl/Makefile.am b/sid/component/cfgroot/libltdl/Makefile.am
index 5236cbc..bc64712 100644 (file)
--- a/sid/component/cfgroot/libltdl/Makefile.am
+++ b/sid/component/cfgroot/libltdl/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 AUTOMAKE_OPTIONS = no-dependencies foreign
-ACLOCAL_AMFLAGS = -I ../../../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../../../config
 
 if INSTALL_LTDL
 include_HEADERS = ltdl.h

diff --git a/sid/component/cfgroot/libltdl/Makefile.in b/sid/component/cfgroot/libltdl/Makefile.in
index 0bc5718..71de815 100644 (file)
--- a/sid/component/cfgroot/libltdl/Makefile.in
+++ b/sid/component/cfgroot/libltdl/Makefile.in
@@ -77,7 +77,7 @@ RANLIB = @RANLIB@
 VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = no-dependencies foreign
-ACLOCAL_AMFLAGS = -I ../../../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../../../config
 
 @INSTALL_LTDL_TRUE@include_HEADERS = @INSTALL_LTDL_TRUE@ltdl.h
 @INSTALL_LTDL_TRUE@lib_LTLIBRARIES = @INSTALL_LTDL_TRUE@libltdl.la
@@ -135,11 +135,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  acinclude.m4 \
-               ../../../config/am_rpm_init.m4 \
-               ../../../config/cgen-maint.m4 \
-               ../../../config/libstdc++.m4 ../../../config/libtool.m4 \
-               ../../../config/ltdl.m4 ../../../config/sidtargets.m4
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  acinclude.m4
        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)

diff --git a/sid/component/cgen-cpu/ChangeLog b/sid/component/cgen-cpu/ChangeLog
index 8e5d946..e9937f0 100644 (file)
--- a/sid/component/cgen-cpu/ChangeLog
+++ b/sid/component/cgen-cpu/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-26  Frank Ch. Eigler  <fche@redhat.com>
+
+       * Makefile.am (ACLOCAL_AMFLAGS): Refer to $srcdir.
+       * Makefile.in: Regenerated.
+
 2001-05-23  Ben Elliston  <bje@redhat.com>
 
        * cgen-types.h (cgen::VOID): Typedef for void.

diff --git a/sid/component/cgen-cpu/Makefile.am b/sid/component/cgen-cpu/Makefile.am
index bd7b2c2..bfc8946 100644 (file)
--- a/sid/component/cgen-cpu/Makefile.am
+++ b/sid/component/cgen-cpu/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = @cpu_subdirs@ .
-ACLOCAL_AMFLAGS = -I ../../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
 
 pkglib_LTLIBRARIES = libcgencpu.la
 

diff --git a/sid/component/cgen-cpu/Makefile.in b/sid/component/cgen-cpu/Makefile.in
index e53ca4c..d11e80f 100644 (file)
--- a/sid/component/cgen-cpu/Makefile.in
+++ b/sid/component/cgen-cpu/Makefile.in
@@ -88,7 +88,7 @@ sidtarget_ppc = @sidtarget_ppc@
 
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = @cpu_subdirs@ .
-ACLOCAL_AMFLAGS = -I ../../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
 
 pkglib_LTLIBRARIES = libcgencpu.la
 

diff --git a/sid/component/cgen-cpu/arm7t/ChangeLog b/sid/component/cgen-cpu/arm7t/ChangeLog
index 0bd7b10..aa71cdb 100644 (file)
--- a/sid/component/cgen-cpu/arm7t/ChangeLog
+++ b/sid/component/cgen-cpu/arm7t/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-26  Frank Ch. Eigler  <fche@redhat.com>
+
+       * Makefile.am (ACLOCAL_AMFLAGS): Refer to $srcdir.
+       * Makefile.in: Regenerated.
+
 2001-06-22  Ben Elliston  <bje@redhat.com>
 
        * arm7f.cxx (arm7f_cpu::memory_trap): Ignore bus::delayed.

diff --git a/sid/component/cgen-cpu/arm7t/Makefile.am b/sid/component/cgen-cpu/arm7t/Makefile.am
index f882e8b..0702511 100644 (file)
--- a/sid/component/cgen-cpu/arm7t/Makefile.am
+++ b/sid/component/cgen-cpu/arm7t/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../../../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../../../config
 
 noinst_LTLIBRARIES = libarm7t.la
 

diff --git a/sid/component/cgen-cpu/arm7t/Makefile.in b/sid/component/cgen-cpu/arm7t/Makefile.in
index 077e14d..b8f551c 100644 (file)
--- a/sid/component/cgen-cpu/arm7t/Makefile.in
+++ b/sid/component/cgen-cpu/arm7t/Makefile.in
@@ -78,7 +78,7 @@ RANLIB = @RANLIB@
 VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../../../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../../../config
 
 noinst_LTLIBRARIES = libarm7t.la
 
@@ -142,11 +142,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-               ../../../config/am_rpm_init.m4 \
-               ../../../config/cgen-maint.m4 \
-               ../../../config/libstdc++.m4 ../../../config/libtool.m4 \
-               ../../../config/ltdl.m4 ../../../config/sidtargets.m4
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)

diff --git a/sid/component/cgen-cpu/m32r/ChangeLog b/sid/component/cgen-cpu/m32r/ChangeLog
index b991600..f328bbd 100644 (file)
--- a/sid/component/cgen-cpu/m32r/ChangeLog
+++ b/sid/component/cgen-cpu/m32r/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-26  Frank Ch. Eigler  <fche@redhat.com>
+
+       * Makefile.am (ACLOCAL_AMFLAGS): Refer to $srcdir.
+       * Makefile.in: Regenerated.
+
 2001-06-22  Ben Elliston  <bje@redhat.com>
 
        * m32rbf.cxx (m32rbf_cpu::memory_trap): Ignore bus::delayed.

diff --git a/sid/component/cgen-cpu/m32r/Makefile.am b/sid/component/cgen-cpu/m32r/Makefile.am
index a46423a..86d32e9 100644 (file)
--- a/sid/component/cgen-cpu/m32r/Makefile.am
+++ b/sid/component/cgen-cpu/m32r/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../../../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../../../config
 
 noinst_LTLIBRARIES = libm32r.la
 

diff --git a/sid/component/cgen-cpu/m32r/Makefile.in b/sid/component/cgen-cpu/m32r/Makefile.in
index 40ff9d4..d182703 100644 (file)
--- a/sid/component/cgen-cpu/m32r/Makefile.in
+++ b/sid/component/cgen-cpu/m32r/Makefile.in
@@ -78,7 +78,7 @@ RANLIB = @RANLIB@
 VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../../../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../../../config
 
 noinst_LTLIBRARIES = libm32r.la
 
@@ -138,11 +138,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-               ../../../config/am_rpm_init.m4 \
-               ../../../config/cgen-maint.m4 \
-               ../../../config/libstdc++.m4 ../../../config/libtool.m4 \
-               ../../../config/ltdl.m4 ../../../config/sidtargets.m4
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)

diff --git a/sid/component/tcl/ChangeLog b/sid/component/tcl/ChangeLog
index a23c8d5..c0e5231 100644 (file)
--- a/sid/component/tcl/ChangeLog
+++ b/sid/component/tcl/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-26  Frank Ch. Eigler  <fche@redhat.com>
+
+       * Makefile.am (ACLOCAL_AMFLAGS): Refer to $srcdir.
+       * Makefile.in: Regenerated.
+
 2001-06-22  Ben Elliston  <bje@redhat.com>
 
        * compTcl.cxx (tcl_component_ctor_0): Omit "delayed" from the bus

diff --git a/sid/component/tcl/Makefile.am b/sid/component/tcl/Makefile.am
index ac17d62..741542f 100644 (file)
--- a/sid/component/tcl/Makefile.am
+++ b/sid/component/tcl/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
 
 pkglib_LTLIBRARIES = libtclapi.la
 

diff --git a/sid/component/tcl/Makefile.in b/sid/component/tcl/Makefile.in
index c037562..4459496 100644 (file)
--- a/sid/component/tcl/Makefile.in
+++ b/sid/component/tcl/Makefile.in
@@ -78,7 +78,7 @@ RANLIB = @RANLIB@
 VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
 
 pkglib_LTLIBRARIES = libtclapi.la
 
@@ -135,10 +135,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-               ../../config/am_rpm_init.m4 ../../config/cgen-maint.m4 \
-               ../../config/libstdc++.m4 ../../config/libtool.m4 \
-               ../../config/ltdl.m4 ../../config/sidtargets.m4
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)

diff --git a/sid/component/timers/ChangeLog b/sid/component/timers/ChangeLog
index d1266c7..9488530 100644 (file)
--- a/sid/component/timers/ChangeLog
+++ b/sid/component/timers/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-26  Frank Ch. Eigler  <fche@redhat.com>
+
+       * Makefile.am (ACLOCAL_AMFLAGS): Refer to $srcdir.
+       * Makefile.in: Regenerated.
+
 2001-03-21  Ben Elliston  <bje@redhat.com>
 
        * Makefile.in: Regenerate.

diff --git a/sid/component/timers/Makefile.am b/sid/component/timers/Makefile.am
index 8546027..950b8bb 100644 (file)
--- a/sid/component/timers/Makefile.am
+++ b/sid/component/timers/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = @cpu_subdirs@ .
-ACLOCAL_AMFLAGS = -I ../../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
 
 pkglib_LTLIBRARIES = libtimers.la
 

diff --git a/sid/component/timers/Makefile.in b/sid/component/timers/Makefile.in
index 3546d58..d60a174 100644 (file)
--- a/sid/component/timers/Makefile.in
+++ b/sid/component/timers/Makefile.in
@@ -87,7 +87,7 @@ sidtarget_ppc = @sidtarget_ppc@
 
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = @cpu_subdirs@ .
-ACLOCAL_AMFLAGS = -I ../../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
 
 pkglib_LTLIBRARIES = libtimers.la
 
@@ -138,10 +138,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-               ../../config/am_rpm_init.m4 ../../config/cgen-maint.m4 \
-               ../../config/libstdc++.m4 ../../config/libtool.m4 \
-               ../../config/ltdl.m4 ../../config/sidtargets.m4
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)

diff --git a/sid/demos/ChangeLog b/sid/demos/ChangeLog
index d45f625..b40731b 100644 (file)
--- a/sid/demos/ChangeLog
+++ b/sid/demos/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-26  Frank Ch. Eigler  <fche@redhat.com>
+
+       * Makefile.am (ACLOCAL_AMFLAGS): Refer to $srcdir.
+       * Makefile.in: Regenerated.
+
 2001-03-21  Ben Elliston  <bje@redhat.com>
 
        * Makefile.in: Regenerate.

diff --git a/sid/demos/Makefile.am b/sid/demos/Makefile.am
index f85d25f..2ca673e 100644 (file)
--- a/sid/demos/Makefile.am
+++ b/sid/demos/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../config
 
 #SUBDIRS = @subdirs@
 SUBDIRS =

diff --git a/sid/demos/Makefile.in b/sid/demos/Makefile.in
index 51e24e1..5ff5979 100644 (file)
--- a/sid/demos/Makefile.in
+++ b/sid/demos/Makefile.in
@@ -78,7 +78,7 @@ RANLIB = @RANLIB@
 VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../config
 
 #SUBDIRS = @subdirs@
 SUBDIRS = 
@@ -103,10 +103,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-               ../config/am_rpm_init.m4 ../config/cgen-maint.m4 \
-               ../config/libstdc++.m4 ../config/libtool.m4 \
-               ../config/ltdl.m4 ../config/sidtargets.m4
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)

diff --git a/sid/demos/voice-pager/ChangeLog b/sid/demos/voice-pager/ChangeLog
index 944f95f..e140dec 100644 (file)
--- a/sid/demos/voice-pager/ChangeLog
+++ b/sid/demos/voice-pager/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-26  Frank Ch. Eigler  <fche@redhat.com>
+
+       * Makefile.am (ACLOCAL_AMFLAGS): Refer to $srcdir.
+       * Makefile.in: Regenerated.
+
 2001-03-21  Ben Elliston  <bje@redhat.com>
 
        * Makefile.in: Regenerate.

diff --git a/sid/demos/voice-pager/Makefile.am b/sid/demos/voice-pager/Makefile.am
index ccabdf4..8b852c6 100644 (file)
--- a/sid/demos/voice-pager/Makefile.am
+++ b/sid/demos/voice-pager/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
 
 CXX = arm-elf-g++
 CXXFLAGS = -g -O2

diff --git a/sid/demos/voice-pager/Makefile.in b/sid/demos/voice-pager/Makefile.in
index 72d9771..0f8a714 100644 (file)
--- a/sid/demos/voice-pager/Makefile.in
+++ b/sid/demos/voice-pager/Makefile.in
@@ -78,7 +78,7 @@ RANLIB = @RANLIB@
 VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
 
 CXX = arm-elf-g++
 CXXFLAGS = -g -O2
@@ -140,10 +140,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-               ../../config/am_rpm_init.m4 ../../config/cgen-maint.m4 \
-               ../../config/libstdc++.m4 ../../config/libtool.m4 \
-               ../../config/ltdl.m4 ../../config/sidtargets.m4
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)

diff --git a/sid/include/ChangeLog b/sid/include/ChangeLog
index 0c01206..33ea064 100644 (file)
--- a/sid/include/ChangeLog
+++ b/sid/include/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-26  Frank Ch. Eigler  <fche@redhat.com>
+
+       * Makefile.am (ACLOCAL_AMFLAGS): Refer to $srcdir.
+       * Makefile.in: Regenerated.
+
 2001-06-25  Ben Elliston  <bje@redhat.com>
 
        * sidcomp.h (bus::status::code): Change type to host_int_1.

diff --git a/sid/include/Makefile.am b/sid/include/Makefile.am
index cb84e85..d99ff28 100644 (file)
--- a/sid/include/Makefile.am
+++ b/sid/include/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../config
 
 include_HEADERS = sidcomp.h sidso.h sidtypes.h
 noinst_HEADERS = sidbusutil.h sidcomputil.h sidpinutil.h sidattrutil.h sidschedutil.h sidmiscutil.h sidconfig.h sidconfutil.h

diff --git a/sid/include/Makefile.in b/sid/include/Makefile.in
index 92cfb01..91bf7a2 100644 (file)
--- a/sid/include/Makefile.in
+++ b/sid/include/Makefile.in
@@ -65,7 +65,7 @@ PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../config
 
 include_HEADERS = sidcomp.h sidso.h sidtypes.h
 noinst_HEADERS = sidbusutil.h sidcomputil.h sidpinutil.h sidattrutil.h sidschedutil.h sidmiscutil.h sidconfig.h sidconfutil.h
@@ -92,10 +92,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-               ../config/am_rpm_init.m4 ../config/cgen-maint.m4 \
-               ../config/libstdc++.m4 ../config/libtool.m4 \
-               ../config/ltdl.m4 ../config/sidtargets.m4
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)

diff --git a/sid/main/ChangeLog b/sid/main/ChangeLog
index 8f9dbea..2775490 100644 (file)
--- a/sid/main/ChangeLog
+++ b/sid/main/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-26  Frank Ch. Eigler  <fche@redhat.com>
+
+       * Makefile.am (ACLOCAL_AMFLAGS): Refer to $srcdir.
+       * Makefile.in: Regenerated.
+
 2001-03-21  Ben Elliston  <bje@redhat.com>
 
        * Makefile.in: Regenerate.

diff --git a/sid/main/Makefile.am b/sid/main/Makefile.am
index 34e4cb6..449b815 100644 (file)
--- a/sid/main/Makefile.am
+++ b/sid/main/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../config
 SUBDIRS = @subdirs@

diff --git a/sid/main/Makefile.in b/sid/main/Makefile.in
index 5fdf120..bf66559 100644 (file)
--- a/sid/main/Makefile.in
+++ b/sid/main/Makefile.in
@@ -64,7 +64,7 @@ PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../config
 SUBDIRS = @subdirs@
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/../config/mkinstalldirs
@@ -86,10 +86,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-               ../config/am_rpm_init.m4 ../config/cgen-maint.m4 \
-               ../config/libstdc++.m4 ../config/libtool.m4 \
-               ../config/ltdl.m4 ../config/sidtargets.m4
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)

diff --git a/sid/main/dynamic/ChangeLog b/sid/main/dynamic/ChangeLog
index 5e9130f..42d97e4 100644 (file)
--- a/sid/main/dynamic/ChangeLog
+++ b/sid/main/dynamic/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-26  Frank Ch. Eigler  <fche@redhat.com>
+
+        * Makefile.am (ACLOCAL_AMFLAGS): Refer to $srcdir.
+        * Makefile.in: Regenerated.
+
 2001-06-19  Frank Ch. Eigler  <fche@redhat.com>
 
        * Makefile.am (NEARBY_LIBS, NEARBY_DEPS_LIBS): Add libcache.la.

diff --git a/sid/main/dynamic/Makefile.am b/sid/main/dynamic/Makefile.am
index 7880fc9..d610887 100644 (file)
--- a/sid/main/dynamic/Makefile.am
+++ b/sid/main/dynamic/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
 
 INCLUDES = -I. -I../../include -I$(srcdir)/../../include
 

diff --git a/sid/main/dynamic/Makefile.in b/sid/main/dynamic/Makefile.in
index f070eac..2627522 100644 (file)
--- a/sid/main/dynamic/Makefile.in
+++ b/sid/main/dynamic/Makefile.in
@@ -78,7 +78,7 @@ RANLIB = @RANLIB@
 VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../../config
+ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
 
 INCLUDES = -I. -I../../include -I$(srcdir)/../../include
 
@@ -111,6 +111,7 @@ bin_PROGRAMS = sid
 @SID_STATIC_FALSE@NEARBY_LIBS = @SID_STATIC_FALSE@../../component/cfgroot/libconfig.la
 @SID_STATIC_TRUE@NEARBY_DEPS_LIBS = @SID_STATIC_TRUE@\
 @SID_STATIC_TRUE@      ../../component/audio/libaudio.la \
+@SID_STATIC_TRUE@      ../../component/cache/libcache.la \
 @SID_STATIC_TRUE@      ../../component/cfgroot/libconfig.la \
 @SID_STATIC_TRUE@      ../../component/cgen-cpu/libcgencpu.la \
 @SID_STATIC_TRUE@      ../../component/consoles/libconsoles.la \
@@ -181,10 +182,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-               ../../config/am_rpm_init.m4 ../../config/cgen-maint.m4 \
-               ../../config/libstdc++.m4 ../../config/libtool.m4 \
-               ../../config/ltdl.m4 ../../config/sidtargets.m4
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)