2000-02-08 Elena Zannoni <ezannoni@kwikemart.cygnus.com>

	* configure.in: Remove the addition of sol-thread.c to the
	CONFIG_INITS list. This caused problems with init.c, because
	sol-thread.c would be grepped twice for _initialize_* functions.
	* configure: Ditto.
	* Makefile.in: Add FIXME for init.c.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8577064..a941844 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2000-02-08  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
+
+       * configure.in: Remove the addition of sol-thread.c to the
+       CONFIG_INITS list. This caused problems with init.c, because
+       sol-thread.c would be grepped twice for _initialize_* functions.
+       * configure: Ditto.
+       * Makefile.in: Add FIXME for init.c.
+
 2000-02-07  Jim Kingdon  <kingdon@redhat.com>
 
        Clean up compiler warnings:

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 034cafa..4d27467 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -687,6 +687,13 @@ uninstall: force
 # Note that the set of files with init functions might change, or the names
 # of the functions might change, so this files needs to depend on all the
 # object files that will be linked into gdb.
+#
+# FIXME: There are 2 problems with this approach. First, if the INIT_FILES
+# list includes a file twice (because of some mistake somewhere else) 
+# the _initialize_* function will be included twice in init.c. Second, 
+# init.c may force unnecessary files to be linked in. Like for instance 
+# tui-file.c.
+#
 
 INIT_FILES = $(OBS) $(TSOBS) $(SUBDIR_INIT_FILES) @CONFIG_INITS@
 init.c: $(INIT_FILES)

diff --git a/gdb/configure b/gdb/configure
index a53879c..40c0881 100755 (executable)
--- a/gdb/configure
+++ b/gdb/configure
@@ -5010,7 +5010,6 @@ EOF
 
          CONFIG_OBS="${CONFIG_OBS} sol-thread.o"
          CONFIG_SRCS="${CONFIG_SRCS} sol-thread.c"
-        CONFIG_INITS="${CONFIG_INITS} sol-thread.c"
          echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
 echo "configure:5016: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`

diff --git a/gdb/configure.in b/gdb/configure.in
index 8c5ba2f..3e3d4f0 100644 (file)
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -321,7 +321,6 @@ if test ${build} = ${host} -a ${host} = ${target} ; then
          AC_DEFINE(HAVE_THREAD_DB_LIB)
          CONFIG_OBS="${CONFIG_OBS} sol-thread.o"
          CONFIG_SRCS="${CONFIG_SRCS} sol-thread.c"
-        CONFIG_INITS="${CONFIG_INITS} sol-thread.c"
          AC_CHECK_LIB(dl, dlopen)
          if test "$GCC" = "yes" ; then
             # The GNU linker requires the -export-dynamic option to make