Re: [HACKERS] small bug in src/interfaces/ecpg/lib/Makefile.in

Applied.


> On Thu, Oct 15, 1998 at 07:05:31PM +0400, Oleg Bartunov wrote:
> > LAtest cvs has a little bug in src/interfaces/ecpg/lib/Makefile.in
> >
> >         $(LD) $(LDFLAGS_SL) -o $@ ecpglib.sho typename.sho.o
> >
> > must be
>
> Here's a patch. It also includes the latest parser changes.
>
> Michael
>
> diff -ruN ecpg/ChangeLog ecpg.mm/ChangeLog
> --- ecpg/ChangeLog    Sat Oct  3 07:47:10 1998
> +++ ecpg.mm/ChangeLog    Thu Oct 15 19:41:20 1998
> @@ -348,4 +348,11 @@
>      - Synced preproc.y with gram.y yet again.
>      - Set version to 2.4.3
>
> +Mon Okt 12 12:36:04 CEST 1998
>
> +    - Synced preproc.y with gram.y yet again.
> +
> +Thu Okt 15 10:05:04 CEST 1998
> +
> +    - Synced preproc.y with gram.y yet again.
> +        - Set version to 2.4.4
> diff -ruN ecpg/lib/Makefile ecpg.mm/lib/Makefile
> --- ecpg/lib/Makefile    Thu Oct 15 19:05:00 1998
> +++ ecpg.mm/lib/Makefile    Thu Oct 15 19:22:07 1998
> @@ -75,8 +75,8 @@
>
>  all: lib$(NAME).a $(shlib)
>
> -$(shlib): ecpglib.sho.o typename.sho.o
> -    $(LD) $(LDFLAGS_SL) -o $@ ecpglib.sho typename.sho.o
> +$(shlib): ecpglib.sho typename.sho
> +    $(LD) $(LDFLAGS_SL) -o $@ ecpglib.sho typename.sho
>
>  clean:
>      rm -f *.o *.sho *.a core a.out *~ $(shlib) lib$(NAME)$(DLSUFFIX)
> @@ -105,7 +105,7 @@
>  typename.o : typename.c ../include/ecpgtype.h
>      $(CC) $(CFLAGS) -I../include $(PQ_INCLUDE) -c $< -o $@
>
> -ecpglib.sho.o : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h
> +ecpglib.sho : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h
>      $(CC) $(CFLAGS) $(CFLAGS_SL) -I../include $(PQ_INCLUDE) -c $< -o $@
> -typename.sho.o : typename.c ../include/ecpgtype.h
> +typename.sho : typename.c ../include/ecpgtype.h
>      $(CC) $(CFLAGS) $(CFLAGS_SL) -I../include $(PQ_INCLUDE) -c $< -o $@
> diff -ruN ecpg/lib/Makefile.in ecpg.mm/lib/Makefile.in
> --- ecpg/lib/Makefile.in    Wed Oct 14 20:14:53 1998
> +++ ecpg.mm/lib/Makefile.in    Thu Oct 15 19:22:16 1998
> @@ -74,8 +74,8 @@
>
>  all: lib$(NAME).a $(shlib)
>
> -$(shlib): ecpglib.sho.o typename.sho.o
> -    $(LD) $(LDFLAGS_SL) -o $@ ecpglib.sho typename.sho.o
> +$(shlib): ecpglib.sho typename.sho
> +    $(LD) $(LDFLAGS_SL) -o $@ ecpglib.sho typename.sho
>
>  clean:
>      rm -f *.o *.sho *.a core a.out *~ $(shlib) lib$(NAME)$(DLSUFFIX)
> @@ -104,7 +104,7 @@
>  typename.o : typename.c ../include/ecpgtype.h
>      $(CC) $(CFLAGS) -I../include $(PQ_INCLUDE) -c $< -o $@
>
> -ecpglib.sho.o : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h
> +ecpglib.sho : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h
>      $(CC) $(CFLAGS) $(CFLAGS_SL) -I../include $(PQ_INCLUDE) -c $< -o $@
> -typename.sho.o : typename.c ../include/ecpgtype.h
> +typename.sho : typename.c ../include/ecpgtype.h
>      $(CC) $(CFLAGS) $(CFLAGS_SL) -I../include $(PQ_INCLUDE) -c $< -o $@
> diff -ruN ecpg/preproc/Makefile ecpg.mm/preproc/Makefile
> --- ecpg/preproc/Makefile    Sat Oct  3 07:47:10 1998
> +++ ecpg.mm/preproc/Makefile    Thu Oct 15 19:41:10 1998
> @@ -3,7 +3,7 @@
>
>  MAJOR_VERSION=2
>  MINOR_VERSION=4
> -PATCHLEVEL=3
> +PATCHLEVEL=4
>
>  CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) \
>      -DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \
> diff -ruN ecpg/preproc/preproc.y ecpg.mm/preproc/preproc.y
> --- ecpg/preproc/preproc.y    Sat Oct  3 07:47:14 1998
> +++ ecpg.mm/preproc/preproc.y    Thu Oct 15 10:11:17 1998
> @@ -2153,6 +2153,10 @@
>                  {
>                      $$ = cat2_str(make1_str("unlisten"), $2);
>                                  }
> +        | UNLISTEN '*'
> +                {
> +                    $$ = make1_str("unlisten *");
> +                                }
>  ;
>
>  /*****************************************************************************
> @@ -3796,9 +3800,9 @@
>                  }
>          ;
>
> -ParamNo:  PARAM
> +ParamNo:  PARAM opt_indirection
>                  {
> -                    $$ = make_name();
> +                    $$ = cat2_str(make_name(), $2);
>                  }
>          ;
>
> @@ -3896,6 +3900,7 @@
>          | STDIN                         { $$ = make1_str("stdin"); }
>          | STDOUT                        { $$ = make1_str("stdout"); }
>          | TIME                { $$ = make1_str("time"); }
> +        | TIMESTAMP            { $$ = make1_str("timestamp"); }
>          | TIMEZONE_HOUR                 { $$ = make1_str("timezone_hour"); }
>                  | TIMEZONE_MINUTE               { $$ = make1_str("timezone_minute"); }
>          | TRIGGER            { $$ = make1_str("trigger"); }
>
> --
> Dr. Michael Meskes      | Th.-Heuss-Str. 61, D-41812 Erkelenz | Go SF49ers!
> Senior-Consultant       | business: Michael.Meskes@mummert.de | Go Rhein Fire!
> Mummert+Partner         |  private: Michael.Meskes@usa.net    | Use Debian
> Unternehmensberatung AG |           Michael.Meskes@gmx.net    | GNU/Linux!
>
>


--
  Bruce Momjian                        |  http://www.op.net/~candle
  maillist@candle.pha.pa.us            |  (610) 853-3000
  +  If your life is a hard drive,     |  830 Blythe Avenue
  +  Christ can be your backup.        |  Drexel Hill, Pennsylvania 19026