[patch] Add SUBDIR_GDBTK_* macros to configure.in and Makefile.in

[Fernando Nasser <fnasser at cygnus dot com>]

More typos fixes.

Also, makes the gdbtk files use the same mechanism as the other
subdirectories.  The files were hard coded in the configure.in
script forcing autoconf to be run for any change in there
(instead of just a Makefile.in change).


ChangeLog:

        * Makefile.in (SUBDIR_GDBTK_OBS, SUBDIR_GDBTK_SRCS,
        SUBDIR_GDBTK_DEPS, SUBDIR_GDBTK_INITS, SUBDIR_GDBTK_LDFLAGS,
        SUBDIR_GDBTK_CFLAGS): New macros.  For gdbtk subdir.
        * configure.in: Fix typo.  It is CONFIG_OBS not CONFIG_OJS.
        Use the SUBDIR_GDBTK_* macros instead of hard coded file names.
        * configure: Regenerate.
	

Index: configure.in
===================================================================
RCS file: /cvs/src/src/gdb/configure.in,v
retrieving revision 1.49
diff -c -p -r1.49 configure.in
*** configure.in        2000/12/11 20:21:57     1.49
--- configure.in        2000/12/11 20:46:30
*************** if test ${build} = ${host} -a ${host} =
*** 407,413 ****
           if test "$GCC" = "yes" ; then
              AC_MSG_RESULT(yes)
              AC_DEFINE(HAVE_HPUX_THREAD_SUPPORT)
!             CONFIG_OBS="${CONFIG_OJS} hpux-thread.o"
              CONFIG_SRCS="${CONFIG_SRCS} hpux-thread.c"
           else
              AC_MSG_RESULT(no (suppressed because you are not using GCC))
--- 407,413 ----
           if test "$GCC" = "yes" ; then
              AC_MSG_RESULT(yes)
              AC_DEFINE(HAVE_HPUX_THREAD_SUPPORT)
!             CONFIG_OBS="${CONFIG_OBS} hpux-thread.o"
              CONFIG_SRCS="${CONFIG_SRCS} hpux-thread.c"
           else
              AC_MSG_RESULT(no (suppressed because you are not using GCC))
*************** if test "${enable_gdbtk}" = "yes"; then
*** 886,901 ****

           # Include some libraries that Tcl and Tk want.
           TCL_LIBS='$(LIBGUI) $(ITCL) $(ITK) $(TIX) $(TK) $(TCL) $(X11_LDFLAGS) $(X11_LIBS)'
-          CONFIG_DEPS='$(LIBGUI) $(ITCL_DEPS) $(ITK_DEPS) $(TIX_DEPS) $(TK_DEPS) $(TCL_DEPS)'
           # Yes, the ordering seems wrong here.  But it isn't.
           # TK_LIBS is the list of libraries that need to be linked
           # after Tcl/Tk.  Note that this isn't put into LIBS.  If it
           # were in LIBS then any link tests after this point would
           # try to include things like `$(LIBGUI)', which wouldn't work.
           GDBTKLIBS="${TCL_LIBS} ${TK_LIBS}"
!          CONFIG_SRCS="${CONFIG_SRCS} gdbtk/generic/gdbtk.c gdbtk/generic/gdbtk-cmds.c
gdbtk/generic/gdbtk-hooks.c gdbtk/generic/gdbtk-varobj.c gdbtk/generic/gdbtk-wrapper.c"
!          CONFIG_OBS="${CONFIG_OBS} gdbtk.o gdbtk-cmds.o gdbtk-hooks.o gdbtk-varobj.o
gdbtk-wrapper.o"
!          CONFIG_INITS="${CONFIG_INITS} gdbtk/generic/gdbtk.c gdbtk/generic/gdbtk-cmds.c
gdbtk/generic/gdbtk-hooks.c gdbtk/generic/gdbtk-varobj.c gdbtk/generic/gdbtk-wrapper.c"
           CONFIG_ALL="${CONFIG_ALL} \$(SUBDIR_GDBTK_ALL)"
           CONFIG_CLEAN="${CONFIG_CLEAN} \$(SUBDIR_GDBTK_CLEAN)"
           CONFIG_INSTALL="${CONFIG_INSTALL} \$(SUBDIR_GDBTK_INSTALL)"
--- 889,905 ----

           # Include some libraries that Tcl and Tk want.
           TCL_LIBS='$(LIBGUI) $(ITCL) $(ITK) $(TIX) $(TK) $(TCL) $(X11_LDFLAGS) $(X11_LIBS)'
           # Yes, the ordering seems wrong here.  But it isn't.
           # TK_LIBS is the list of libraries that need to be linked
           # after Tcl/Tk.  Note that this isn't put into LIBS.  If it
           # were in LIBS then any link tests after this point would
           # try to include things like `$(LIBGUI)', which wouldn't work.
           GDBTKLIBS="${TCL_LIBS} ${TK_LIBS}"
!
!            CONFIG_OBS="${CONFIG_OBS} \$(SUBDIR_GDBTK_OBS)"
!            CONFIG_DEPS="${CONFIG_DEPS} \$(SUBDIR_GDBTK_DEPS)"
!            CONFIG_SRCS="${CONFIG_SRCS} \$(SUBDIR_GDBTK_SRCS)"
!            CONFIG_INITS="${CONFIG_INITS} \$(SUBDIR_GDBTK_INITS)"
           CONFIG_ALL="${CONFIG_ALL} \$(SUBDIR_GDBTK_ALL)"
           CONFIG_CLEAN="${CONFIG_CLEAN} \$(SUBDIR_GDBTK_CLEAN)"
           CONFIG_INSTALL="${CONFIG_INSTALL} \$(SUBDIR_GDBTK_INSTALL)"
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.51
diff -c -p -r1.51 Makefile.in
*** Makefile.in 2000/12/04 23:27:59     1.51
--- Makefile.in 2000/12/11 20:46:30
*************** SUBDIR_MI_SRCS = \
*** 166,172 ****
        mi/mi-main.c mi/mi-parse.c mi/mi-getopt.c
  SUBDIR_MI_DEPS =
  SUBDIR_MI_INITS = \
!       mi/mi-cmds.c mi/mi-parse.c mi/mi-main.c
  SUBDIR_MI_LDFLAGS=
  SUBDIR_MI_CFLAGS= \
        -DUI_OUT=1
--- 166,172 ----
        mi/mi-main.c mi/mi-parse.c mi/mi-getopt.c
  SUBDIR_MI_DEPS =
  SUBDIR_MI_INITS = \
!       mi/mi-cmds.c mi/mi-parse.c mi/mi-main.c mi/mi-out.c
  SUBDIR_MI_LDFLAGS=
  SUBDIR_MI_CFLAGS= \
        -DUI_OUT=1
*************** WIN32LDAPP = @WIN32LDAPP@
*** 259,264 ****
--- 259,276 ----
  LIBGUI = @LIBGUI@
  GUI_CFLAGS_X = @GUI_CFLAGS_X@
  IDE_CFLAGS=$(GUI_CFLAGS_X) $(IDE_CFLAGS_X)
+
+ SUBDIR_GDBTK_OBS = \
+       gdbtk.o gdbtk-cmds.o gdbtk-hooks.o gdbtk-varobj.o gdbtk-wrapper.o
+ SUBDIR_GDBTK_SRCS = \
+       gdbtk/generic/gdbtk.c gdbtk/generic/gdbtk-cmds.c \
+       gdbtk/generic/gdbtk-hooks.c gdbtk/generic/gdbtk-varobj.c \
+       gdbtk/generic/gdbtk-wrapper.c
+ SUBDIR_GDBTK_DEPS = \
+       $(LIBGUI) $(ITCL_DEPS) $(ITK_DEPS) $(TIX_DEPS) $(TK_DEPS) $(TCL_DEPS)
+ SUBDIR_GDBTK_INITS = gdbtk/generic/gdbtk.c
+ SUBDIR_GDBTK_LDFLAGS=
+ SUBDIR_GDBTK_CFLAGS= -DGDBTK
  SUBDIR_GDBTK_ALL= all-gdbtk
  SUBDIR_GDBTK_CLEAN= clean-gdbtk
  SUBDIR_GDBTK_INSTALL= install-gdbtk


-- 
Fernando Nasser
Red Hat Canada Ltd.                     E-Mail:  fnasser@redhat.com
2323 Yonge Street, Suite #300
Toronto, Ontario   M4P 2C9