+2001-06-19 Frank Ch. Eigler <fche@redhat.com>
+
+ * Makefile.am (NEARBY_LIBS, NEARBY_DEPS_LIBS): Add libcache.la.
+ * Makefile.in: Regenerated.
+
+2001-03-21 Frank Ch. Eigler <fche@redhat.com>
+
+ * Makefile.am (NEARBY_DEPS_LIBS): New macro.
+ (sid_DEPENDENCIES, sid_LDADD): Use it.
+ * Makefile.in: Regenerated.
+
2001-03-21 Ben Elliston <bje@redhat.com>
* Makefile.in: Regenerate.
if SID_STATIC
NEARBY_LIBS = \
-dlpreopen ../../component/audio/libaudio.la \
+ -dlpreopen ../../component/cache/libcache.la \
-dlpreopen ../../component/cfgroot/libconfig.la \
-dlpreopen ../../component/cgen-cpu/libcgencpu.la \
-dlpreopen ../../component/consoles/libconsoles.la \
-dlpreopen ../../component/tcl/libtclapi.la \
-dlpreopen ../../component/timers/libtimers.la \
-dlpreopen ../../component/uart/libuart.la
+NEARBY_DEPS_LIBS = \
+ ../../component/audio/libaudio.la \
+ ../../component/cache/libcache.la \
+ ../../component/cfgroot/libconfig.la \
+ ../../component/cgen-cpu/libcgencpu.la \
+ ../../component/consoles/libconsoles.la \
+ ../../component/gdb/libgdb.la \
+ ../../component/gloss/libgloss.la \
+ ../../component/glue/libglue.la \
+ ../../component/ide/libide.la \
+ ../../component/interrupt/libinterrupt.la \
+ ../../component/lcd/libhd44780u.la \
+ ../../component/lcd/liblcd-char-display.la \
+ ../../component/lcd/libt6963c.la \
+ ../../component/loader/libloader.la \
+ ../../component/mapper/libmapper.la \
+ ../../component/memory/libmemory.la \
+ ../../component/mmu/libmmu.la \
+ ../../component/parport/libparport.la \
+ ../../component/profiling/libprof.la \
+ ../../component/rtc/librtc.la \
+ ../../component/sched/libsched.la \
+ ../../component/tcl/libtclapi.la \
+ ../../component/timers/libtimers.la \
+ ../../component/uart/libuart.la
AM_CXXFLAGS = -DSID_STATIC
else
-NEARBY_LIBS =
+NEARBY_LIBS = ../../component/cfgroot/libconfig.la
+NEARBY_DEPS_LIBS = $(NEARBY_LIBS)
AM_CXXFLAGS =
endif
sid_SOURCES = mainDynamic.cxx
sid_LDFLAGS = -export-dynamic -static -export-symbols-regex '[a-zA-Z0-9]*_library$$' $(NEARBY_LIBS)
-sid_LDADD = ../../component/cfgroot/libconfig.la
+sid_DEPENDENCIES = $(NEARBY_DEPS_LIBS)
bin_PROGRAMS = sid
@SID_STATIC_TRUE@NEARBY_LIBS = @SID_STATIC_TRUE@\
@SID_STATIC_TRUE@ -dlpreopen ../../component/audio/libaudio.la \
+@SID_STATIC_TRUE@ -dlpreopen ../../component/cache/libcache.la \
@SID_STATIC_TRUE@ -dlpreopen ../../component/cfgroot/libconfig.la \
@SID_STATIC_TRUE@ -dlpreopen ../../component/cgen-cpu/libcgencpu.la \
@SID_STATIC_TRUE@ -dlpreopen ../../component/consoles/libconsoles.la \
@SID_STATIC_TRUE@ -dlpreopen ../../component/tcl/libtclapi.la \
@SID_STATIC_TRUE@ -dlpreopen ../../component/timers/libtimers.la \
@SID_STATIC_TRUE@ -dlpreopen ../../component/uart/libuart.la
-@SID_STATIC_FALSE@NEARBY_LIBS =
+@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/cfgroot/libconfig.la \
+@SID_STATIC_TRUE@ ../../component/cgen-cpu/libcgencpu.la \
+@SID_STATIC_TRUE@ ../../component/consoles/libconsoles.la \
+@SID_STATIC_TRUE@ ../../component/gdb/libgdb.la \
+@SID_STATIC_TRUE@ ../../component/gloss/libgloss.la \
+@SID_STATIC_TRUE@ ../../component/glue/libglue.la \
+@SID_STATIC_TRUE@ ../../component/ide/libide.la \
+@SID_STATIC_TRUE@ ../../component/interrupt/libinterrupt.la \
+@SID_STATIC_TRUE@ ../../component/lcd/libhd44780u.la \
+@SID_STATIC_TRUE@ ../../component/lcd/liblcd-char-display.la \
+@SID_STATIC_TRUE@ ../../component/lcd/libt6963c.la \
+@SID_STATIC_TRUE@ ../../component/loader/libloader.la \
+@SID_STATIC_TRUE@ ../../component/mapper/libmapper.la \
+@SID_STATIC_TRUE@ ../../component/memory/libmemory.la \
+@SID_STATIC_TRUE@ ../../component/mmu/libmmu.la \
+@SID_STATIC_TRUE@ ../../component/parport/libparport.la \
+@SID_STATIC_TRUE@ ../../component/profiling/libprof.la \
+@SID_STATIC_TRUE@ ../../component/rtc/librtc.la \
+@SID_STATIC_TRUE@ ../../component/sched/libsched.la \
+@SID_STATIC_TRUE@ ../../component/tcl/libtclapi.la \
+@SID_STATIC_TRUE@ ../../component/timers/libtimers.la \
+@SID_STATIC_TRUE@ ../../component/uart/libuart.la
+@SID_STATIC_FALSE@NEARBY_DEPS_LIBS = @SID_STATIC_FALSE@$(NEARBY_LIBS)
@SID_STATIC_TRUE@AM_CXXFLAGS = @SID_STATIC_TRUE@-DSID_STATIC
@SID_STATIC_FALSE@AM_CXXFLAGS =
sid_SOURCES = mainDynamic.cxx
sid_LDFLAGS = -export-dynamic -static -export-symbols-regex '[a-zA-Z0-9]*_library$$' $(NEARBY_LIBS)
-sid_LDADD = ../../component/cfgroot/libconfig.la
+sid_DEPENDENCIES = $(NEARBY_DEPS_LIBS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/../../config/mkinstalldirs
CONFIG_HEADER = config.h
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
sid_OBJECTS = mainDynamic.o
-sid_DEPENDENCIES = ../../component/cfgroot/libconfig.la
+sid_LDADD = $(LDADD)
CXXFLAGS = @CXXFLAGS@
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)