aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2006-08-09 22:48:17 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2006-08-09 22:48:17 +0000
commit0bf9d3a59e6a7108b04dcf46a592578fe01d1679 (patch)
tree6193ba9c5cc2fe1099d1f5d9127de8d745ccfe42
parent6a7d3d093e3b925232af8fb1e219ee3e3e0757c3 (diff)
downloadpostgresql-0bf9d3a59e6a7108b04dcf46a592578fe01d1679.tar.gz
postgresql-0bf9d3a59e6a7108b04dcf46a592578fe01d1679.zip
Fix inadequate makefile-fu in ecpg regression tests. I think this
will fix current platypus build failure.
-rw-r--r--src/interfaces/ecpg/test/Makefile.regress9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/interfaces/ecpg/test/Makefile.regress b/src/interfaces/ecpg/test/Makefile.regress
index b116c866e06..c79393b7e09 100644
--- a/src/interfaces/ecpg/test/Makefile.regress
+++ b/src/interfaces/ecpg/test/Makefile.regress
@@ -1,12 +1,13 @@
override CPPFLAGS := -I$(srcdir)/../../include -I$(libpq_srcdir) $(CPPFLAGS)
-override CFLAGS += $(PTHREAD_CFLAGS) -I$(srcdir)/../../include -I$(libpq_srcdir) -I../../include -I$(top_builddir)/src/include
-override LDFLAGS += -L../../ecpglib -L../../pgtypeslib -L../../../libpq
-override LIBS += -lpgtypes -lecpg -lpq
+override CFLAGS += $(PTHREAD_CFLAGS)
+
+override LDFLAGS := -L../../ecpglib -L../../pgtypeslib -L../../../libpq $(LDFLAGS)
+override LIBS := -lpgtypes -lecpg -lpq $(LIBS) $(PTHREAD_LIBS)
ECPG = ../../preproc/ecpg -I$(srcdir)/../../include
%: %.c
- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) $(PTHREAD_LIBS) -o $@
+ $(CC) $(CPPFLAGS) $(CFLAGS) $^ $(LDFLAGS) $(LIBS) -o $@
%.c: %.pgc ../regression.h
$(ECPG) -o $@ -I$(srcdir) $<