From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cagney To: GDB Patches , "Insight (GDB GUI)" Subject: [PATCH] Kick GDBtk's magic ln -s code out of configure.in Date: Thu, 02 Mar 2000 21:47:00 -0000 Message-id: <38BF51AF.31CE8109@cygnus.com> X-SW-Source: 2000-q1/msg00112.html Hello, The attatched patch moves that magic bit of code that links gdb/gdbtcl to ${srcdir}/gdb/gdbtk/library out of configure and into Makefile.in. At the same time it adds code to clean the link up. That in turn fixes a problem creating releases :-) Andrew Fri Mar 3 15:39:34 2000 Andrew Cagney * 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. Index: Makefile.in =================================================================== RCS file: /cvs/src/src/gdb/Makefile.in,v retrieving revision 1.10 diff -p -r1.10 Makefile.in *** Makefile.in 2000/03/03 02:50:23 1.10 --- Makefile.in 2000/03/03 05:38:40 *************** SHELL = @SHELL@ *** 49,54 **** --- 49,55 ---- EXEEXT = @EXEEXT@ AWK = @AWK@ + LN_S = @LN_S@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ *************** SUBDIR_MI_INITS = \ *** 162,167 **** --- 163,170 ---- SUBDIR_MI_LDFLAGS= SUBDIR_MI_CFLAGS= \ -DUI_OUT=1 + SUBDIR_MI_ALL= + SUBDIR_MI_CLEAN= SUBDIR_MI_INSTALL= SUBDIR_MI_UNINSTALL= *************** WIN32LDAPP = @WIN32LDAPP@ *** 222,227 **** --- 225,232 ---- 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= *************** CONFIG_DEPS= @CONFIG_DEPS@ *** 231,236 **** --- 236,244 ---- 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@ *************** DISTSTUFF = $(YYFILES) *** 642,648 **** .c.o: $(CC) -c $(INTERNAL_CFLAGS) $< ! all: gdb$(EXEEXT) @$(MAKE) $(FLAGS_TO_PASS) DO=all "DODIRS=`echo $(SUBDIRS) | sed 's/testsuite//'`" subdir_do installcheck: --- 650,656 ---- .c.o: $(CC) -c $(INTERNAL_CFLAGS) $< ! all: gdb$(EXEEXT) $(CONFIG_ALL) @$(MAKE) $(FLAGS_TO_PASS) DO=all "DODIRS=`echo $(SUBDIRS) | sed 's/testsuite//'`" subdir_do installcheck: *************** TAGS: $(TAGFILES_NO_SRCDIR) $(TAGFILES_W *** 855,861 **** tags: TAGS ! clean mostlyclean: @$(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 --- 863,869 ---- tags: TAGS ! 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 *************** findvar.o: findvar.c $(defs_h) $(gdbcore *** 1250,1255 **** --- 1258,1276 ---- 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 ; \ Index: configure.in =================================================================== RCS file: /cvs/src/src/gdb/configure.in,v retrieving revision 1.9 diff -p -r1.9 configure.in *** configure.in 2000/03/03 02:50:24 1.9 --- configure.in 2000/03/03 05:38:54 *************** CONFIG_DEPS= *** 43,48 **** --- 43,50 ---- CONFIG_SRCS= CONFIG_INITS= ENABLE_CFLAGS= + CONFIG_ALL= + CONFIG_CLEAN= CONFIG_INSTALL= CONFIG_UNINSTALL= *************** case ${enable_gdbmi} in *** 390,395 **** --- 392,399 ---- 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 *************** if test "${enable_gdbtk}" = "yes"; then *** 701,706 **** --- 705,712 ---- 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)" *************** AC_SUBST(CONFIG_OBS) *** 767,772 **** --- 773,780 ---- 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) *************** files="${files} config/nm-empty.h" *** 912,927 **** 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) --- 920,925 ----