From 391bbd820dbe47dfb542ec4046a313ce71e38615 Mon Sep 17 00:00:00 2001 From: fche Date: Thu, 1 Mar 2001 00:44:03 +0000 Subject: [PATCH] * bug fix / cleanup 2001-02-28 Frank Ch. Eigler * Makefile.am (NEARBY_LIBS): Enumerate component libraries for static linking. (sid_LDFLAGS): Correct export-symbols-regex param to include tcl bridge component. Use $(NEARBY_LIBS). * Makefile.in: Regenerated. --- sid/main/dynamic/ChangeLog | 8 ++++++++ sid/main/dynamic/Makefile.am | 38 ++++++++++++++++++++++++----------- sid/main/dynamic/Makefile.in | 47 ++++++++++++++++++++++++++------------------ 3 files changed, 63 insertions(+), 30 deletions(-) diff --git a/sid/main/dynamic/ChangeLog b/sid/main/dynamic/ChangeLog index bcab249b3a..4c25ba3631 100644 --- a/sid/main/dynamic/ChangeLog +++ b/sid/main/dynamic/ChangeLog @@ -1,3 +1,11 @@ +2001-02-28 Frank Ch. Eigler + + * Makefile.am (NEARBY_LIBS): Enumerate component libraries for + static linking. + (sid_LDFLAGS): Correct export-symbols-regex param to + include tcl bridge component. Use $(NEARBY_LIBS). + * Makefile.in: Regenerated. + 2001-02-05 Frank Ch. Eigler * Makefile.am (sid_LDFLAGS): Add export-symbols-regex parameter to diff --git a/sid/main/dynamic/Makefile.am b/sid/main/dynamic/Makefile.am index 8a5927d942..8793da4d04 100644 --- a/sid/main/dynamic/Makefile.am +++ b/sid/main/dynamic/Makefile.am @@ -11,21 +11,37 @@ bin_PROGRAMS = sid # statically link in a bunch of component libraries using libtool's # '-dlpreopen' flag. -NEARBY_LIBS = $(wildcard ../../component/*/*.la) - if SID_STATIC -NEARBY_LIBS2 = $(foreach l,$(NEARBY_LIBS),-dlpreopen $(l)) -# This weird little target is needed because automake puts "-dlpreopen FOO1 -dlpreopen FOO2" -# into sid_DEPENDENCIES. --dlpreopen: - true +NEARBY_LIBS = \ + -dlpreopen ../../component/audio/libaudio.la \ + -dlpreopen ../../component/cfgroot/libconfig.la \ + -dlpreopen ../../component/cgen-cpu/libcgencpu.la \ + -dlpreopen ../../component/consoles/libconsoles.la \ + -dlpreopen ../../component/gdb/libgdb.la \ + -dlpreopen ../../component/gloss/libgloss.la \ + -dlpreopen ../../component/glue/libglue.la \ + -dlpreopen ../../component/ide/libide.la \ + -dlpreopen ../../component/interrupt/libinterrupt.la \ + -dlpreopen ../../component/lcd/libhd44780u.la \ + -dlpreopen ../../component/lcd/liblcd-char-display.la \ + -dlpreopen ../../component/lcd/libt6963c.la \ + -dlpreopen ../../component/loader/libloader.la \ + -dlpreopen ../../component/mapper/libmapper.la \ + -dlpreopen ../../component/memory/libmemory.la \ + -dlpreopen ../../component/mmu/libmmu.la \ + -dlpreopen ../../component/parport/libparport.la \ + -dlpreopen ../../component/profiling/libprof.la \ + -dlpreopen ../../component/rtc/librtc.la \ + -dlpreopen ../../component/sched/libsched.la \ + -dlpreopen ../../component/tcl/libtclapi.la \ + -dlpreopen ../../component/timers/libtimers.la \ + -dlpreopen ../../component/uart/libuart.la AM_CXXFLAGS = -DSID_STATIC else -NEARBY_LIBS2 = +NEARBY_LIBS = AM_CXXFLAGS = endif sid_SOURCES = mainDynamic.cxx -sid_LDFLAGS = -export-dynamic -static -export-symbols-regex '[a-zA-Z0-9]*_component_library$$' -sid_LDADD = ../../component/cfgroot/libconfig.la $(NEARBY_LIBS2) - +sid_LDFLAGS = -export-dynamic -static -export-symbols-regex '[a-zA-Z0-9]*_library$$' $(NEARBY_LIBS) +sid_LDADD = ../../component/cfgroot/libconfig.la diff --git a/sid/main/dynamic/Makefile.in b/sid/main/dynamic/Makefile.in index 527f27cbc9..143784df6f 100644 --- a/sid/main/dynamic/Makefile.in +++ b/sid/main/dynamic/Makefile.in @@ -83,20 +83,37 @@ ACLOCAL_AMFLAGS = -I ../../config INCLUDES = -I. -I../../include -I$(srcdir)/../../include bin_PROGRAMS = sid - -# If sid is being compiled without shared library support, arrange to -# statically link in a bunch of component libraries using libtool's -# '-dlpreopen' flag. - -NEARBY_LIBS = $(wildcard ../../component/*/*.la) -@SID_STATIC_TRUE@NEARBY_LIBS2 = @SID_STATIC_TRUE@$(foreach l,$(NEARBY_LIBS),-dlpreopen $(l)) -@SID_STATIC_FALSE@NEARBY_LIBS2 = +@SID_STATIC_TRUE@NEARBY_LIBS = @SID_STATIC_TRUE@\ +@SID_STATIC_TRUE@ -dlpreopen ../../component/audio/libaudio.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/gdb/libgdb.la \ +@SID_STATIC_TRUE@ -dlpreopen ../../component/gloss/libgloss.la \ +@SID_STATIC_TRUE@ -dlpreopen ../../component/glue/libglue.la \ +@SID_STATIC_TRUE@ -dlpreopen ../../component/ide/libide.la \ +@SID_STATIC_TRUE@ -dlpreopen ../../component/interrupt/libinterrupt.la \ +@SID_STATIC_TRUE@ -dlpreopen ../../component/lcd/libhd44780u.la \ +@SID_STATIC_TRUE@ -dlpreopen ../../component/lcd/liblcd-char-display.la \ +@SID_STATIC_TRUE@ -dlpreopen ../../component/lcd/libt6963c.la \ +@SID_STATIC_TRUE@ -dlpreopen ../../component/loader/libloader.la \ +@SID_STATIC_TRUE@ -dlpreopen ../../component/mapper/libmapper.la \ +@SID_STATIC_TRUE@ -dlpreopen ../../component/memory/libmemory.la \ +@SID_STATIC_TRUE@ -dlpreopen ../../component/mmu/libmmu.la \ +@SID_STATIC_TRUE@ -dlpreopen ../../component/parport/libparport.la \ +@SID_STATIC_TRUE@ -dlpreopen ../../component/profiling/libprof.la \ +@SID_STATIC_TRUE@ -dlpreopen ../../component/rtc/librtc.la \ +@SID_STATIC_TRUE@ -dlpreopen ../../component/sched/libsched.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_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]*_component_library$$' -sid_LDADD = ../../component/cfgroot/libconfig.la $(NEARBY_LIBS2) +sid_LDFLAGS = -export-dynamic -static -export-symbols-regex '[a-zA-Z0-9]*_library$$' $(NEARBY_LIBS) +sid_LDADD = ../../component/cfgroot/libconfig.la ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../../config/mkinstalldirs CONFIG_HEADER = config.h @@ -110,11 +127,7 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ sid_OBJECTS = mainDynamic.o -@SID_STATIC_FALSE@sid_DEPENDENCIES = \ -@SID_STATIC_FALSE@../../component/cfgroot/libconfig.la -@SID_STATIC_TRUE@sid_DEPENDENCIES = \ -@SID_STATIC_TRUE@../../component/cfgroot/libconfig.la $(foreach \ -@SID_STATIC_TRUE@l,$(NEARBY_LIBS),-dlpreopen $(l)) +sid_DEPENDENCIES = ../../component/cfgroot/libconfig.la 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) @@ -462,10 +475,6 @@ uninstall-am uninstall all-redirect all-am all installdirs \ mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean -# This weird little target is needed because automake puts "-dlpreopen FOO1 -dlpreopen FOO2" -# into sid_DEPENDENCIES. -@SID_STATIC_TRUE@-dlpreopen: -@SID_STATIC_TRUE@ true # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. -- 2.11.0