Only re-generate copying.c when maintainer mode.

gdb/ChangeLog

@@ -1,3 +1,14 @@
+Thu Apr 13 13:24:27 2000  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure.in: Add --enable-maintainer-mode.
+	* aclocal.m4, configure: Re-generate.
+
+	* Makefile.in ($(srcdir)/copying.c): Enable dependencies only when
+ 	on maintainer-mode.  Update copying.c in source directory.
+	(copying.txt): Delete rule.
+	(copying.o): Add explict paths to $(srcdir) and explicit make
+ 	rule.
+
 2000-04-12  Kevin Buettner  <kevinb@redhat.com>
 
 	* ia64-linux-nat.c (IA64_PSR_DB, IA64_PSR_DD): Define.

gdb/Makefile.in

@@ -941,19 +941,12 @@ doc/gdb.dvi:
 doc/gdb.info:
 	cd doc; $(MAKE) gdb.info $(FLAGS_TO_PASS)
 
-# When DJGPP Make runs on MS-DOS, it downcases all file names, so
-# it doesn't find COPYING, and wants to make it...
-copying.txt:
-	test -f copying.txt || \
-	  (test "$$LN_S" = "ln -s" && \
-	    ln -s $(srcdir)/COPYING copying.txt;) || \
-	  cp -p $(srcdir)/COPYING copying.txt 2>/dev/null || \
-	  ln $(srcdir)/COPYING copying.txt 2>/dev/null || \
-	  cp $(srcdir)/COPYING copying.txt
-
 # Make copying.c from COPYING
-copying.c: copying.txt copying.awk
+$(srcdir)/copying.c: @MAINTAINER_MODE_TRUE@ \
-	awk -f $(srcdir)/copying.awk < copying.txt > copying.c
+		$(srcdir)/COPYING $(srcdir)/copying.awk
+	awk -f $(srcdir)/copying.awk \
+		< $(srcdir)/COPYING > $(srcdir)/copying.tmp
+	mv $(srcdir)/copying.tmp $(srcdir)/copying.c
 
 version.c: Makefile
 	rm -f version.c
@@ -1200,7 +1193,9 @@ complaints.o: complaints.c complaints.h $(defs_h) $(gdbcmd_h)
 # OBSOLETE convex-xdep.o: convex-xdep.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
 # OBSOLETE	$(inferior_h)
 
-copying.o: copying.c $(defs_h) $(gdbcmd_h)
+# Provide explicit rule/dependency - works for more makes.
+copying.o: $(srcdir)/copying.c $(defs_h) $(gdbcmd_h)
+	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/copying.c
 
 core-aout.o: core-aout.c $(defs_h) $(gdbcore_h) $(value_h) $(inferior_h)
 

gdb/aclocal.m4

@@ -872,6 +872,39 @@ dnl    AC_SUBST(TIX_BUILD_INCLUDES)
 dnl    AC_SUBST(TIX_LIB_SPEC)
 ])
 
+# Add --enable-maintainer-mode option to configure.
+# From Jim Meyering
+
+# serial 1
+
+AC_DEFUN(AM_MAINTAINER_MODE,
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode is disabled by default
+  AC_ARG_ENABLE(maintainer-mode,
+[  --enable-maintainer-mode enable make rules and dependencies not useful
+                          (and sometimes confusing) to the casual installer],
+      USE_MAINTAINER_MODE=$enableval,
+      USE_MAINTAINER_MODE=no)
+  AC_MSG_RESULT($USE_MAINTAINER_MODE)
+  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST(MAINT)dnl
+]
+)
+
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
 
 # serial 1
 

gdb/configure.in

@@ -22,6 +22,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.13)dnl
 AC_INIT(main.c)
 AC_CONFIG_HEADER(config.h:config.in)
+AM_MAINTAINER_MODE
 
 AC_PROG_CC
 AC_AIX