* Makefile.in (BISONFLAGS): Drop -v.

($(srcdir)/deltat.c): Change to source directory before rebuilding, so path to
source tree doesn't get inserted.

(deltat.c rebuilt)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17178 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 4bb3baae77aae3f35c1495aaafb9d374100692f0..979d17a771f46f058e154a5ad0e82f25fcf60040 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,5 +1,9 @@
 2005-04-13  Ken Raeburn  <raeburn@mit.edu>
 
+       * Makefile.in (BISONFLAGS): Drop -v.
+       ($(srcdir)/deltat.c): Change to source directory before
+       rebuilding, so path to source tree doesn't get inserted.
+
        * fwd_tgt.c (NEED_SOCKETS): Don't define.
        * recvauth.c (NEED_SOCKETS): Don't define.
        * sendauth.c (NEED_SOCKETS): Don't define.

diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in
index 633e1d38f5c49a8c068f0ae4cbcecb30ca01a9cf..d792a48c4ff343ce4d602ad98de5f39b9ca156e8 100644 (file)
--- a/src/lib/krb5/krb/Makefile.in
+++ b/src/lib/krb5/krb/Makefile.in
@@ -276,12 +276,12 @@ SRCS=     $(srcdir)/addr_comp.c   \
 
 # Someday, when we have a "maintainer mode", do this right:
 BISON=bison
-BISONFLAGS=-v # -v -> .output; -d -> .h
+BISONFLAGS= # -v -> .output; -d -> .h
 DELTAT_DEP=@MAINT@ x-deltat.y
 ##WIN32##DELTAT_DEP=
 
 $(srcdir)/deltat.c : $(DELTAT_DEP)
-       $(BISON) $(BISONFLAGS) -o $(srcdir)/deltat.c $(srcdir)/x-deltat.y
+       (cd $(srcdir) && $(BISON) $(BISONFLAGS) -o deltat.c x-deltat.y)
 
 ##DOS##LIBOBJS = $(OBJS)
 

diff --git a/src/lib/krb5/krb/deltat.c b/src/lib/krb5/krb/deltat.c
index a12e42d784df08a801244e898234be64d4c86ea8..770234de5db8d4ae95cc6095ad690783b1cb0841 100644 (file)
--- a/src/lib/krb5/krb/deltat.c
+++ b/src/lib/krb5/krb/deltat.c
@@ -68,7 +68,7 @@
 
 
 /* Copy the first part of user declarations.  */
-#line 38 "../../../../src/lib/krb5/krb/x-deltat.y"
+#line 38 "x-deltat.y"
 
 
 #include <ctype.h>
@@ -168,10 +168,10 @@ static int yyparse (void *);
 #endif
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 125 "../../../../src/lib/krb5/krb/x-deltat.y"
+#line 125 "x-deltat.y"
 typedef union YYSTYPE { int val; } YYSTYPE;
 /* Line 191 of yacc.c.  */
-#line 175 "../../../../src/lib/krb5/krb/deltat.c"
+#line 175 "deltat.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -183,7 +183,7 @@ typedef union YYSTYPE { int val; } YYSTYPE;
 
 
 /* Line 214 of yacc.c.  */
-#line 187 "../../../../src/lib/krb5/krb/deltat.c"
+#line 187 "deltat.c"
 
 #if ! defined (yyoverflow) || YYERROR_VERBOSE
 
@@ -1077,74 +1077,74 @@ yyreduce:
   switch (yyn)
     {
         case 6:
-#line 138 "../../../../src/lib/krb5/krb/x-deltat.y"
+#line 138 "x-deltat.y"
     { yyval.val = - yyvsp[0].val; ;}
     break;
 
   case 9:
-#line 140 "../../../../src/lib/krb5/krb/x-deltat.y"
+#line 140 "x-deltat.y"
     { yyval.val = yyvsp[0].val; ;}
     break;
 
   case 10:
-#line 141 "../../../../src/lib/krb5/krb/x-deltat.y"
-    { YYERROR ;}
+#line 141 "x-deltat.y"
+    { YYERROR; ;}
     break;
 
   case 11:
-#line 143 "../../../../src/lib/krb5/krb/x-deltat.y"
+#line 143 "x-deltat.y"
     { DO (yyvsp[-2].val,  0,  0, yyvsp[0].val); ;}
     break;
 
   case 12:
-#line 144 "../../../../src/lib/krb5/krb/x-deltat.y"
+#line 144 "x-deltat.y"
     { DO ( 0, yyvsp[-2].val,  0, yyvsp[0].val); ;}
     break;
 
   case 13:
-#line 145 "../../../../src/lib/krb5/krb/x-deltat.y"
+#line 145 "x-deltat.y"
     { DO ( 0,  0, yyvsp[-2].val, yyvsp[0].val); ;}
     break;
 
   case 14:
-#line 146 "../../../../src/lib/krb5/krb/x-deltat.y"
+#line 146 "x-deltat.y"
     { DO ( 0,  0,  0, yyvsp[-1].val); ;}
     break;
 
   case 15:
-#line 147 "../../../../src/lib/krb5/krb/x-deltat.y"
+#line 147 "x-deltat.y"
     { DO (yyvsp[-6].val, yyvsp[-4].val, yyvsp[-2].val, yyvsp[0].val); ;}
     break;
 
   case 16:
-#line 148 "../../../../src/lib/krb5/krb/x-deltat.y"
+#line 148 "x-deltat.y"
     { DO ( 0, yyvsp[-4].val, yyvsp[-2].val, yyvsp[0].val); ;}
     break;
 
   case 17:
-#line 149 "../../../../src/lib/krb5/krb/x-deltat.y"
+#line 149 "x-deltat.y"
     { DO ( 0, yyvsp[-2].val, yyvsp[0].val,  0); ;}
     break;
 
   case 18:
-#line 150 "../../../../src/lib/krb5/krb/x-deltat.y"
+#line 150 "x-deltat.y"
     { DO ( 0,  0,  0, yyvsp[0].val); ;}
     break;
 
   case 20:
-#line 155 "../../../../src/lib/krb5/krb/x-deltat.y"
+#line 155 "x-deltat.y"
     { if (HOUR_NOT_OK(yyvsp[-2].val)) YYERROR;
                                          DO_SUM(yyval.val, yyvsp[-2].val * 3600, yyvsp[0].val); ;}
     break;
 
   case 22:
-#line 159 "../../../../src/lib/krb5/krb/x-deltat.y"
+#line 159 "x-deltat.y"
     { if (MIN_NOT_OK(yyvsp[-2].val)) YYERROR;
                                          DO_SUM(yyval.val, yyvsp[-2].val * 60, yyvsp[0].val); ;}
     break;
 
   case 23:
-#line 162 "../../../../src/lib/krb5/krb/x-deltat.y"
+#line 162 "x-deltat.y"
     { yyval.val = 0; ;}
     break;
 
@@ -1152,7 +1152,7 @@ yyreduce:
     }
 
 /* Line 993 of yacc.c.  */
-#line 1156 "../../../../src/lib/krb5/krb/deltat.c"
+#line 1156 "deltat.c"
 \f
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1377,7 +1377,7 @@ yyreturn:
 }
 
 
-#line 165 "../../../../src/lib/krb5/krb/x-deltat.y"
+#line 165 "x-deltat.y"
 
 
 static int