From ab9b4d8086f33f8d7ed0277bc86daa27630863e3 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Tue, 14 Mar 2000 15:55:17 +0000 Subject: [PATCH] > The snprintf stuff in interfaces/ecpg/preproc/Makefile.in is broken. Please > apply the attached patch. > > Andreas Kardos > > --- src/interfaces/ecpg/preproc/Makefile.in | 6 +++--- src/interfaces/jdbc/Makefile | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/interfaces/ecpg/preproc/Makefile.in b/src/interfaces/ecpg/preproc/Makefile.in index d97a0717a95..d14f97b86f2 100644 --- a/src/interfaces/ecpg/preproc/Makefile.in +++ b/src/interfaces/ecpg/preproc/Makefile.in @@ -9,7 +9,7 @@ CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) \ -DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \ -DINCLUDE_PATH=\"$(HEADERDIR)\" -g -OBJ=preproc.o pgc.o type.o ecpg.o ecpg_keywords.o output.o\ +OBJS=preproc.o pgc.o type.o ecpg.o ecpg_keywords.o output.o\ keywords.o c_keywords.o ../lib/typename.o descriptor.o variable.o all:: ecpg @@ -22,8 +22,8 @@ $(SRCDIR)/backend/port/snprintf.o: endif # Rule that really do something. -ecpg: $(OBJ) - $(CC) -o ecpg $(OBJ) $(LEXLIB) $(LDFLAGS) +ecpg: $(OBJS) + $(CC) -o ecpg $(OBJS) $(LEXLIB) $(LDFLAGS) preproc.c preproc.h: preproc.y $(YACC) $(YFLAGS) $< diff --git a/src/interfaces/jdbc/Makefile b/src/interfaces/jdbc/Makefile index 95789f765f3..b502531fd50 100644 --- a/src/interfaces/jdbc/Makefile +++ b/src/interfaces/jdbc/Makefile @@ -4,7 +4,7 @@ # Makefile for Java JDBC interface # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.17 2000/03/08 01:58:25 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.18 2000/03/14 15:55:17 momjian Exp $ # #------------------------------------------------------------------------- @@ -151,7 +151,7 @@ jdbc2real: postgresql/DriverClass.class \ # Note: This works by storing all compiled classes under the postgresql # directory. We use this later for compiling the dual-mode driver. # -postgresql.jar: $(OBJ) $(OBJ_COMMON) +postgresql.jar: $(OBJ_COMMON) $(JAR) -c0f $@ `$(FIND) postgresql -name "*.class" -print` \ $(wildcard postgresql/*.properties)