diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.global | 14 | ||||
| -rw-r--r-- | src/bin/pgtclsh/Makefile | 6 | ||||
| -rw-r--r-- | src/interfaces/libpq++/examples/Makefile | 12 | ||||
| -rw-r--r-- | src/test/examples/Makefile | 8 |
4 files changed, 20 insertions, 20 deletions
diff --git a/src/Makefile.global b/src/Makefile.global index b6ec4c24bac..32a5e8f278e 100644 --- a/src/Makefile.global +++ b/src/Makefile.global @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.53 1996/11/04 05:01:47 momjian Exp $ +# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.54 1996/11/04 05:14:16 momjian Exp $ # # NOTES # This is seen by any Makefiles that include mk/postgres.mk. To @@ -144,8 +144,8 @@ OIDNAMELEN = 36 # Compile libpq++ #HAVE_Cplusplus= true -# Set CDEBUG to -O for optimization, or -g for debuggable binaries -CDEBUG= -O +# Set COPT to -O for optimization, or -g for debuggable binaries +COPT= -O # Commenting out CASSERT will make things go a LOT faster, but you will # also loose a lot of useful error-checking. @@ -856,7 +856,7 @@ includedir= $(HEADERDIR) # This goes here so that customization in Makefile.custom is effective ############################################################################## # -# Flags for CC and LD. (depend on CDEBUG and PROFILE) +# Flags for CC and LD. (depend on COPT and PROFILE) # # PostgreSQL should *always* compile with -Wall -Werror enabled CFLAGS+= -Wall -Werror @@ -865,9 +865,9 @@ CFLAGS+= -Wall -Werror # on the options selected above. -ifdef CDEBUG - CFLAGS+= $(CDEBUG) - LDFLAGS+= $(CDEBUG) +ifdef COPT + CFLAGS+= $(COPT) + LDFLAGS+= $(COPT) else ifndef CFLAGS_OPT CFLAGS_OPT= -O diff --git a/src/bin/pgtclsh/Makefile b/src/bin/pgtclsh/Makefile index 0e80d3b8317..e0e4f8c3018 100644 --- a/src/bin/pgtclsh/Makefile +++ b/src/bin/pgtclsh/Makefile @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.2 1996/07/23 03:03:36 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.3 1996/11/04 05:14:34 momjian Exp $ # #------------------------------------------------------------------------- @@ -21,11 +21,11 @@ CFLAGS+= -I$(TCL_INCDIR) -I$(TK_INCDIR) -I$(X11_INCDIR) -I$(srcdir)/libpgtcl LIBPGTCL= -L$(srcdir)/libpgtcl/$(objdir) -L$(LIBDIR) -lpgtcl pgtclsh: $(objdir)/pgtclAppInit.o - $(CC) $(CDEBUG) -o $(objdir)/$(@F) $(objdir)/pgtclAppInit.o\ + $(CC) $(CFLAGS) -o $(objdir)/$(@F) $(objdir)/pgtclAppInit.o\ $(LIBPGTCL) $(LIBPQ) -L$(TCL_LIBDIR) $(TCL_LIB) -lm $(LD_ADD) pgtksh: $(objdir)/pgtkAppInit.o - $(CC) $(CDEBUG) -o $(objdir)/$(@F) $(objdir)/pgtkAppInit.o \ + $(CC) $(CFLAGS) -o $(objdir)/$(@F) $(objdir)/pgtkAppInit.o \ $(LIBPGTCL) $(LIBPQ) -L$(TCL_LIBDIR) -L$(TK_LIBDIR) -L$(X11_LIBDIR) \ $(TK_LIB) $(TCL_LIB) -lX11 -lm $(LD_ADD) diff --git a/src/interfaces/libpq++/examples/Makefile b/src/interfaces/libpq++/examples/Makefile index 5e51d915876..6010ab9faf4 100644 --- a/src/interfaces/libpq++/examples/Makefile +++ b/src/interfaces/libpq++/examples/Makefile @@ -24,37 +24,37 @@ P0_PROG:= testlibpq0 P0_OBJS:= testlibpq0.o $(P0_PROG): $(addprefix $(objdir)/,$(P0_OBJS)) - $(CXX) $(CDEBUG) -o $(objdir)/$(@F) $< $(LD_ADD) + $(CXX) $(CFLAGS) -o $(objdir)/$(@F) $< $(LD_ADD) P1_PROG:= testlibpq1 P1_OBJS:= testlibpq1.o $(P1_PROG): $(addprefix $(objdir)/,$(P1_OBJS)) - $(CXX) $(CDEBUG) -o $(objdir)/$(@F) $< $(LD_ADD) + $(CXX) $(CFLAGS) -o $(objdir)/$(@F) $< $(LD_ADD) P2_PROG:= testlibpq2 P2_OBJS:= testlibpq2.o $(P2_PROG): $(addprefix $(objdir)/,$(P2_OBJS)) - $(CXX) $(CDEBUG) -o $(objdir)/$(@F) $< $(LD_ADD) + $(CXX) $(CFLAGS) -o $(objdir)/$(@F) $< $(LD_ADD) P3_PROG:= testlibpq3 P3_OBJS:= testlibpq3.o $(P3_PROG): $(addprefix $(objdir)/,$(P3_OBJS)) - $(CXX) $(CDEBUG) -o $(objdir)/$(@F) $< $(LD_ADD) + $(CXX) $(CFLAGS) -o $(objdir)/$(@F) $< $(LD_ADD) P4_PROG:= testlibpq4 P4_OBJS:= testlibpq4.o $(P4_PROG): $(addprefix $(objdir)/,$(P4_OBJS)) - $(CXX) $(CDEBUG) -o $(objdir)/$(@F) $< $(LD_ADD) + $(CXX) $(CFLAGS) -o $(objdir)/$(@F) $< $(LD_ADD) P5_PROG:= testlo P5_OBJS:= testlo.o $(P5_PROG): $(addprefix $(objdir)/,$(P5_OBJS)) - $(CXX) $(CDEBUG) -o $(objdir)/$(@F) $< $(LD_ADD) + $(CXX) $(CFLAGS) -o $(objdir)/$(@F) $< $(LD_ADD) OBJS:= $(P0_OBJS) $(P1_OBJS) $(P2_OBJS) $(P3_OBJS) $(P4_OBJS) $(P5_OBJS) PROGS:= $(P0_PROG) $(P1_PROG) $(P2_PROG) $(P3_PROG) $(P4_PROG) $(P5_PROG) diff --git a/src/test/examples/Makefile b/src/test/examples/Makefile index fb79062bc23..65b30647558 100644 --- a/src/test/examples/Makefile +++ b/src/test/examples/Makefile @@ -23,26 +23,26 @@ P1_PROG:= testlibpq P1_OBJS:= testlibpq.o $(P1_PROG): $(addprefix $(objdir)/,$(P1_OBJS)) - $(CC) $(CDEBUG) -o $(objdir)/$(@F) $< $(LD_ADD) + $(CC) $(CFLAGS) -o $(objdir)/$(@F) $< $(LD_ADD) P2_PROG:= testlibpq2 P2_OBJS:= testlibpq2.o $(P2_PROG): $(addprefix $(objdir)/,$(P2_OBJS)) - $(CC) $(CDEBUG) -o $(objdir)/$(@F) $< $(LD_ADD) + $(CC) $(CFLAGS) -o $(objdir)/$(@F) $< $(LD_ADD) P3_PROG:= testlibpq3 P3_OBJS:= testlibpq3.o $(P3_PROG): $(addprefix $(objdir)/,$(P3_OBJS)) - $(CC) $(CDEBUG) -o $(objdir)/$(@F) $< $(LD_ADD) + $(CC) $(CFLAGS) -o $(objdir)/$(@F) $< $(LD_ADD) P4_PROG:= testlo P4_OBJS:= testlo.o $(P4_PROG): $(addprefix $(objdir)/,$(P4_OBJS)) - $(CC) $(CDEBUG) -o $(objdir)/$(@F) $< $(LD_ADD) + $(CC) $(CFLAGS) -o $(objdir)/$(@F) $< $(LD_ADD) OBJS:= $(P1_OBJS) $(P2_OBJS) $(P3_OBJS) $(P4_OBJS) PROGS:= $(P1_PROG) $(P2_PROG) $(P3_PROG) $(P4_PROG) |