Move GDBtk's ``ln -s ... gdbtcl'' code out of configure.
Add CONFIG_CLEAN, CONFIG_ALL to configured targets. Add all-gdbtk, clean-gdbtk.
This commit is contained in:
Andrew Cagney
parent
379d643457
commit
b3a9033281
|
|
@ -1,3 +1,16 @@
|
|||
Fri Mar 3 15:39:34 2000 Andrew Cagney <cagney@b1.cygnus.com>
|
||||
|
||||
* Makefile.in (CONFIG_CLEAN, CONFIG_ALL, LN_S): Defined by
|
||||
configure.
|
||||
(SUBDIR_MI_CLEAN, SUBDIR_GDBTK_CLEAN, SUBDIR_MI_ALL,
|
||||
SUBDIR_GDBTK_ALL): Define.
|
||||
(all-gdbtk, clean-gdbtk): New targets.
|
||||
(all): Add CONFIG_ALL as dependency.
|
||||
(clean): Add CONFIG_CLEAN as dependency.
|
||||
|
||||
* configure.in (CONFIG_ALL, CONFIG_CLEAN): Define.
|
||||
(LN_S): Define. Delete GDBtk's link code.
|
||||
|
||||
Fri Mar 3 13:12:34 2000 Andrew Cagney <cagney@b1.cygnus.com>
|
||||
|
||||
* configure.in (ENABLE_GDBTK): Delete variable.
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@ SHELL = @SHELL@
|
|||
EXEEXT = @EXEEXT@
|
||||
|
||||
AWK = @AWK@
|
||||
LN_S = @LN_S@
|
||||
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
|
|
@ -162,6 +163,8 @@ SUBDIR_MI_INITS = \
|
|||
SUBDIR_MI_LDFLAGS=
|
||||
SUBDIR_MI_CFLAGS= \
|
||||
-DUI_OUT=1
|
||||
SUBDIR_MI_ALL=
|
||||
SUBDIR_MI_CLEAN=
|
||||
SUBDIR_MI_INSTALL=
|
||||
SUBDIR_MI_UNINSTALL=
|
||||
|
||||
|
|
@ -222,6 +225,8 @@ WIN32LDAPP = @WIN32LDAPP@
|
|||
LIBGUI = @LIBGUI@
|
||||
GUI_CFLAGS_X = @GUI_CFLAGS_X@
|
||||
IDE_CFLAGS=$(GUI_CFLAGS_X) $(IDE_CFLAGS_X)
|
||||
SUBDIR_GDBTK_ALL= all-gdbtk
|
||||
SUBDIR_GDBTK_CLEAN= clean-gdbtk
|
||||
SUBDIR_GDBTK_INSTALL= install-gdbtk
|
||||
SUBDIR_GDBTK_UNINSTALL=
|
||||
|
||||
|
|
@ -231,6 +236,9 @@ CONFIG_DEPS= @CONFIG_DEPS@
|
|||
CONFIG_INITS= @CONFIG_INITS@
|
||||
CONFIG_LDFLAGS = @CONFIG_LDFLAGS@
|
||||
ENABLE_CFLAGS= @ENABLE_CFLAGS@
|
||||
CONFIG_ALL= @CONFIG_ALL@
|
||||
CONFIG_CLEAN= @CONFIG_CLEAN@
|
||||
CONFIG_CLEAN= @CONFIG_CLEAN@
|
||||
CONFIG_INSTALL = @CONFIG_INSTALL@
|
||||
CONFIG_UNINSTALL = @CONFIG_UNINSTALL@
|
||||
|
||||
|
|
@ -642,7 +650,7 @@ DISTSTUFF = $(YYFILES)
|
|||
.c.o:
|
||||
$(CC) -c $(INTERNAL_CFLAGS) $<
|
||||
|
||||
all: gdb$(EXEEXT)
|
||||
all: gdb$(EXEEXT) $(CONFIG_ALL)
|
||||
@$(MAKE) $(FLAGS_TO_PASS) DO=all "DODIRS=`echo $(SUBDIRS) | sed 's/testsuite//'`" subdir_do
|
||||
|
||||
installcheck:
|
||||
|
|
@ -855,7 +863,7 @@ TAGS: $(TAGFILES_NO_SRCDIR) $(TAGFILES_WITH_SRCDIR)
|
|||
|
||||
tags: TAGS
|
||||
|
||||
clean mostlyclean:
|
||||
clean mostlyclean: $(CONFIG_CLEAN)
|
||||
@$(MAKE) $(FLAGS_TO_PASS) DO=clean "DODIRS=$(SUBDIRS)" subdir_do
|
||||
rm -f *.o *.a $(ADD_FILES) *~ init.c-tmp init.l-tmp
|
||||
rm -f init.c version.c
|
||||
|
|
@ -1251,6 +1259,19 @@ findvar.o: findvar.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h \
|
|||
fork-child.o: fork-child.c gdb_wait.h $(defs_h) $(gdbcore_h) \
|
||||
$(inferior_h) target.h terminal.h gdbthread.h gdb_string.h
|
||||
|
||||
all-gdbtk:
|
||||
if test "$(LN_S)" = "ln -s" -a ! -d gdbtcl/images ; then \
|
||||
echo linking $srcdir/gdbtk/library to gdbtcl ; \
|
||||
$(LN_S) $srcdir/gdbtk/library gdbtcl ; \
|
||||
else \
|
||||
echo Warning: Unable to link $srcdir/gdbtk/library to gdbtcl. ; \
|
||||
echo " " You will need to do a ; \
|
||||
echo " " make install before you are able to run the GUI. ; \
|
||||
fi
|
||||
|
||||
clean-gdbtk:
|
||||
rm -f gdbtcl
|
||||
|
||||
install-gdbtk:
|
||||
$(SHELL) $(srcdir)/../mkinstalldirs $(datadir)/gdbtcl ; \
|
||||
$(SHELL) $(srcdir)/../mkinstalldirs \
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -43,6 +43,8 @@ CONFIG_DEPS=
|
|||
CONFIG_SRCS=
|
||||
CONFIG_INITS=
|
||||
ENABLE_CFLAGS=
|
||||
CONFIG_ALL=
|
||||
CONFIG_CLEAN=
|
||||
CONFIG_INSTALL=
|
||||
CONFIG_UNINSTALL=
|
||||
|
||||
|
|
@ -390,6 +392,8 @@ case ${enable_gdbmi} in
|
|||
CONFIG_SRCS="${CONFIG_SRS} \$(SUBDIR_MI_SRCS)"
|
||||
CONFIG_INITS="${CONFIG_INITS} \$(SUBDIR_MI_INITS)"
|
||||
ENABLE_CFLAGS="${ENABLE_CFLAGS} \$(SUBDIR_MI_CFLAGS)"
|
||||
CONFIG_ALL="${CONFIG_ALL} \$(SUBDIR_MI_ALL)"
|
||||
CONFIG_CLEAN="${CONFIG_CLEAN} \$(SUBDIR_MI_CLEAN)"
|
||||
CONFIG_INSTALL="${CONFIG_INSTALL} \$(SUBDIR_MI_INSTALL)"
|
||||
CONFIG_UNINSTALL="${CONFIG_UNINSTALL} \$(SUBDIR_MI_UNINSTALL)"
|
||||
fi
|
||||
|
|
@ -701,6 +705,8 @@ if test "${enable_gdbtk}" = "yes"; then
|
|||
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_ALL} \$(SUBDIR_GDBTK_CLEAN)"
|
||||
CONFIG_INSTALL="${CONFIG_INSTALL} \$(SUBDIR_GDBTK_INSTALL)"
|
||||
CONFIG_UNINSTALL="${CONFIG_UNINSTALL} \$(SUBDIR_GDBTK_UNINSTALL)"
|
||||
|
||||
|
|
@ -767,6 +773,8 @@ AC_SUBST(CONFIG_OBS)
|
|||
AC_SUBST(CONFIG_DEPS)
|
||||
AC_SUBST(CONFIG_SRCS)
|
||||
AC_SUBST(CONFIG_INITS)
|
||||
AC_SUBST(CONFIG_ALL)
|
||||
AC_SUBST(CONFIG_CLEAN)
|
||||
AC_SUBST(CONFIG_INSTALL)
|
||||
AC_SUBST(CONFIG_UNINSTALL)
|
||||
|
||||
|
|
@ -912,16 +920,6 @@ files="${files} config/nm-empty.h"
|
|||
links="${links} nm.h"
|
||||
fi
|
||||
AC_PROG_LN_S
|
||||
# Make it possible to use the GUI without doing a full install
|
||||
if test "${enable_gdbtk}" = "yes" ; then
|
||||
if test "$LN_S" = "ln -s" -a ! -f gdbtcl ; then
|
||||
echo linking $srcdir/gdbtk/library to gdbtcl
|
||||
$LN_S $srcdir/gdbtk/library gdbtcl
|
||||
else
|
||||
echo Warning: Unable to link $srcdir/gdbtk/library to gdbtcl. You will need to do a
|
||||
echo " " make install before you are able to run the GUI.
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_LINK_FILES($files, $links)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue