This is the mail archive of the gdb-patches@sourceware.cygnus.com mailing list for the GDB project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

[PATCH] Don't try to install Insight

Hello,

The attatched patch should stop the install process trying to install
GDBtk (unless of course GDBtk was built :-).

	Andrew
Thu Feb 24 18:42:15 2000  Andrew Cagney  <cagney@b1.cygnus.com>

	* configure.in (CONFIG_INSTALL, CONFIG_UNINSTALL): Set to
 	$(SUBDIR_*_INSTALL) when so configured.
	* configure: Regenerate.
	
	* Makefile.in (CONFIG_INSTALL, CONFIG_UNINSTALL): Define using
 	configure.
	(install-only): Add dependency on $(CONFIG_INSTALL).  Delete code
 	installing GDBtk.
	(uninstall): Add dependency on $(CONFIG_UNINSTALL).
	(SUBDIR_MI_INSTALL, SUBDIR_MI_UNINSTALL, SUBDIR_GDBTK_UNINSTALL,
 	SUBDIR_GDBTK_INSTALL): Define.
	(install-gdbtk): New target.

Index: configure.in
===================================================================
RCS file: /cvs/src/src/gdb/configure.in,v
retrieving revision 1.6
diff -p -r1.6 configure.in
*** configure.in	2000/02/24 07:27:51	1.6
--- configure.in	2000/02/24 07:54:31
*************** CONFIG_DEPS=
*** 43,48 ****
--- 43,50 ----
  CONFIG_SRCS=
  CONFIG_INITS=
  ENABLE_CFLAGS=
+ CONFIG_INSTALL=
+ CONFIG_UNINSTALL=
  
  configdirs="doc testsuite"
  
*************** case ${enable_gdbmi} in
*** 385,390 ****
--- 387,394 ----
        CONFIG_SRCS="${CONFIG_SRS} \$(SUBDIR_MI_SRCS)"
        CONFIG_INITS="${CONFIG_INITS} \$(SUBDIR_MI_INITS)"
        ENABLE_CFLAGS="${ENABLE_CFLAGS} \$(SUBDIR_MI_CFLAGS)"
+       CONFIG_INSTALL="${CONFIG_INSTALL} \$(SUBDIR_MI_INSTALL)"
+       CONFIG_UNINSTALL="${CONFIG_UNINSTALL} \$(SUBDIR_MI_UNINSTALL)"
      fi
      ;;
  esac
*************** if test "${enable_gdbtk}" = "yes"; then
*** 694,699 ****
--- 698,705 ----
  	   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_INSTALL="${CONFIG_INSTALL} \$(SUBDIR_GDBTK_INSTALL)"
+ 	   CONFIG_UNINSTALL="${CONFIG_UNINSTALL} \$(SUBDIR_GDBTK_UNINSTALL)"
  
  	   if test x$gdb_cv_os_cygwin = xyes; then
  	      WIN32LIBS="${WIN32LIBS} -lshell32 -lgdi32 -lcomdlg32 -ladvapi32"
*************** AC_SUBST(CONFIG_OBS)
*** 759,764 ****
--- 765,772 ----
  AC_SUBST(CONFIG_DEPS)
  AC_SUBST(CONFIG_SRCS)
  AC_SUBST(CONFIG_INITS)
+ AC_SUBST(CONFIG_INSTALL)
+ AC_SUBST(CONFIG_UNINSTALL)
  
  # Begin stuff to support --enable-shared
  AC_ARG_ENABLE(shared,
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.7
diff -p -r1.7 Makefile.in
*** Makefile.in	2000/02/23 00:25:41	1.7
--- Makefile.in	2000/02/24 08:04:17
*************** SUBDIR_MI_INITS = \
*** 161,166 ****
--- 161,168 ----
  SUBDIR_MI_LDFLAGS=
  SUBDIR_MI_CFLAGS= \
  	-DUI_OUT=1
+ SUBDIR_MI_INSTALL=
+ SUBDIR_MI_UNINSTALL=
  
  # Opcodes currently live in one of two places.  Either they are in the
  # opcode library, typically ../opcodes, or they are in a header file
*************** ENABLE_GDBTK= @ENABLE_GDBTK@
*** 220,225 ****
--- 222,229 ----
  LIBGUI = @LIBGUI@
  GUI_CFLAGS_X = @GUI_CFLAGS_X@
  IDE_CFLAGS=$(GUI_CFLAGS_X) $(IDE_CFLAGS_X)
+ SUBDIR_GDBTK_INSTALL= install-gdbtk
+ SUBDIR_GDBTK_UNINSTALL= 
  
  CONFIG_OBS= @CONFIG_OBS@
  CONFIG_SRCS= @CONFIG_SRCS@
*************** CONFIG_DEPS= @CONFIG_DEPS@
*** 227,232 ****
--- 231,238 ----
  CONFIG_INITS= @CONFIG_INITS@
  CONFIG_LDFLAGS = @CONFIG_LDFLAGS@
  ENABLE_CFLAGS= @ENABLE_CFLAGS@
+ CONFIG_INSTALL = @CONFIG_INSTALL@
+ CONFIG_UNINSTALL = @CONFIG_UNINSTALL@
  
  # -I. for config files.
  # -I$(srcdir) for gdb internal headers and possibly for gnu-regex.h also.
*************** gdb.z:gdb.1
*** 665,671 ****
  # time it takes for make to check that all is up to date.
  # install-only is intended to address that need.
  install: all install-only
! install-only:
  	transformed_name=`t='$(program_transform_name)'; \
  			  echo gdb | sed -e $$t` ; \
  		if test "x$$transformed_name" = x; then \
--- 671,677 ----
  # time it takes for make to check that all is up to date.
  # install-only is intended to address that need.
  install: all install-only
! install-only: $(CONFIG_INSTALL)
  	transformed_name=`t='$(program_transform_name)'; \
  			  echo gdb | sed -e $$t` ; \
  		if test "x$$transformed_name" = x; then \
*************** install-only:
*** 675,695 ****
  		fi ; \
  		$(INSTALL_PROGRAM) gdb$(EXEEXT) $(bindir)/$$transformed_name$(EXEEXT) ; \
  		$(INSTALL_DATA) $(srcdir)/gdb.1 $(man1dir)/$$transformed_name.1
- 	$(SHELL) $(srcdir)/../mkinstalldirs $(datadir)/gdbtcl ; \
- 	$(SHELL) $(srcdir)/../mkinstalldirs \
- 		$(datadir)/gdbtcl/images \
- 		$(datadir)/gdbtcl/images2 ; \
- 	$(SHELL) $(srcdir)/../mkinstalldirs $(datadir)/gdbtcl/help \
- 		$(datadir)/gdbtcl/help/images \
- 		$(datadir)/gdbtcl/help/trace ; \
- 	cd $(srcdir)/gdbtk/library ; \
- 	for i in *.tcl *.ith *.itb images/*.gif images2/*.gif images/icons.txt images2/icons.txt tclIndex help/*.html  help/trace/*.html help/trace/index.toc help/images/*.gif; \
- 	  do \
- 		$(INSTALL_DATA) $$i $(datadir)/gdbtcl/$$i ; \
- 	  done ;
  	@$(MAKE) DO=install "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do 
  
! uninstall: force
  	transformed_name=`t='$(program_transform_name)'; \
  			  echo gdb | sed -e $$t` ; \
  		if test "x$$transformed_name" = x; then \
--- 681,689 ----
  		fi ; \
  		$(INSTALL_PROGRAM) gdb$(EXEEXT) $(bindir)/$$transformed_name$(EXEEXT) ; \
  		$(INSTALL_DATA) $(srcdir)/gdb.1 $(man1dir)/$$transformed_name.1
  	@$(MAKE) DO=install "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do 
  
! uninstall: force $(CONFIG_UNINSTALL)
  	transformed_name=`t='$(program_transform_name)'; \
  			  echo gdb | sed -e $$t` ; \
  		if test "x$$transformed_name" = x; then \
*************** findvar.o: findvar.c $(defs_h) $(gdbcore
*** 1256,1261 ****
--- 1250,1269 ----
  
  fork-child.o: fork-child.c gdb_wait.h $(defs_h) $(gdbcore_h) \
  	$(inferior_h) target.h terminal.h gdbthread.h gdb_string.h
+ 
+ install-gdbtk:
+ 	$(SHELL) $(srcdir)/../mkinstalldirs $(datadir)/gdbtcl ; \
+ 	$(SHELL) $(srcdir)/../mkinstalldirs \
+ 		$(datadir)/gdbtcl/images \
+ 		$(datadir)/gdbtcl/images2 ; \
+ 	$(SHELL) $(srcdir)/../mkinstalldirs $(datadir)/gdbtcl/help \
+ 		$(datadir)/gdbtcl/help/images \
+ 		$(datadir)/gdbtcl/help/trace ; \
+ 	cd $(srcdir)/gdbtk/library ; \
+ 	for i in *.tcl *.ith *.itb images/*.gif images2/*.gif images/icons.txt images2/icons.txt tclIndex help/*.html  help/trace/*.html help/trace/index.toc help/images/*.gif; \
+ 	  do \
+ 		$(INSTALL_DATA) $$i $(datadir)/gdbtcl/$$i ; \
+ 	  done ;
  
  gdbres.o: $(srcdir)/gdbtk/gdb.rc $(srcdir)/gdbtk/gdbtool.ico
  	$(WINDRES) --include $(srcdir)/gdbtk $(srcdir)/gdbtk/gdb.rc gdbres.o
Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]